Merge branch 'master' into linux

Conflicts:
	atom.gyp
	vendor/apm
	vendor/brightray

browser/ui/cocoa/atom_menu_controller.h

@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_ATOM_MENU_CONTROLLER_MAC_H_
-#define ATOM_BROWSER_UI_ATOM_MENU_CONTROLLER_MAC_H_
+#ifndef ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
+#define ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -69,4 +69,4 @@ class MenuModel;
 - (NSMenu*)menuFromModel:(ui::MenuModel*)model;
 @end
 
-#endif  // ATOM_BROWSER_UI_ATOM_MENU_CONTROLLER_MAC_H_
+#endif  // ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_

browser/ui/cocoa/atom_menu_controller.mm

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "browser/ui/atom_menu_controller_mac.h"
+#import "browser/ui/cocoa/atom_menu_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"

browser/ui/cocoa/event_processing_window.h

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_ATOM_EVENT_PROCESSING_WINDOW_H_
-#define ATOM_BROWSER_UI_ATOM_EVENT_PROCESSING_WINDOW_H_
+#ifndef ATOM_BROWSER_UI_COCOA_EVENT_PROCESSING_WINDOW_H_
+#define ATOM_BROWSER_UI_COCOA_EVENT_PROCESSING_WINDOW_H_
 
 #import <Cocoa/Cocoa.h>
 
 // Override NSWindow to access unhandled keyboard events (for command
 // processing); subclassing NSWindow is the only method to do
 // this.
-@interface AtomEventProcessingWindow : NSWindow {
+@interface EventProcessingWindow : NSWindow {
  @private
   BOOL redispatchingEvent_;
   BOOL eventHandled_;
@@ -27,4 +27,4 @@
 - (BOOL)performKeyEquivalent:(NSEvent*)theEvent;
 @end
 
-#endif  // ATOM_BROWSER_UI_ATOM_EVENT_PROCESSING_WINDOW_H_
+#endif  // ATOM_BROWSER_UI_COCOA_EVENT_PROCESSING_WINDOW_H_

browser/ui/cocoa/event_processing_window.mm

@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "browser/ui/atom_event_processing_window.h"
+#import "browser/ui/cocoa/event_processing_window.h"
 
 #include "base/logging.h"
 #import "content/public/browser/render_widget_host_view_mac_base.h"
 
-@interface AtomEventProcessingWindow ()
+@interface EventProcessingWindow ()
 // Duplicate the given key event, but changing the associated window.
 - (NSEvent*)keyEventForWindow:(NSWindow*)window fromKeyEvent:(NSEvent*)event;
 @end
 
-@implementation AtomEventProcessingWindow
+@implementation EventProcessingWindow
 
 - (BOOL)redispatchKeyEvent:(NSEvent*)event {
   DCHECK(event);
@@ -103,4 +103,4 @@
   return NO;
 }
 
-@end  // AtomEventProcessingWindow
+@end  // EventProcessingWindow

browser/ui/cocoa/nsalert_synchronous_sheet.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "browser/ui/nsalert_synchronous_sheet_mac.h"
+#import "browser/ui/cocoa/nsalert_synchronous_sheet.h"
 
 // Private methods -- use prefixes to avoid collisions with Apple's methods
 @interface NSAlert (SynchronousSheetPrivate)

browser/ui/file_dialog_win.cc

@@ -163,6 +163,7 @@ class FileDialog {
   }
 
   bool Show(atom::NativeWindow* parent_window) {
+    atom::NativeWindow::DialogScope dialog_scope(parent_window);
     HWND window = parent_window ? parent_window->GetNativeWindow() : NULL;
     return dialog_->DoModal(window) == IDOK;
   }

browser/ui/message_box_mac.mm

@@ -9,7 +9,7 @@
 #include "base/callback.h"
 #include "base/strings/sys_string_conversions.h"
 #include "browser/native_window.h"
-#include "browser/ui/nsalert_synchronous_sheet_mac.h"
+#include "browser/ui/cocoa/nsalert_synchronous_sheet.h"
 
 @interface ModalDelegate : NSObject {
  @private

browser/ui/message_box_win.cc

@@ -76,6 +76,7 @@ class MessageDialog : public base::MessageLoop::Dispatcher,
   string16 title_;
   views::Widget* widget_;
   views::MessageBoxView* message_box_view_;
+  scoped_ptr<NativeWindow::DialogScope> dialog_scope_;
   std::vector<views::LabelButton*> buttons_;
   MessageBoxCallback callback_;
 
@@ -96,7 +97,8 @@ MessageDialog::MessageDialog(NativeWindow* parent_window,
       result_(-1),
       title_(UTF8ToUTF16(title)),
       widget_(NULL),
-      message_box_view_(NULL) {
+      message_box_view_(NULL),
+      dialog_scope_(new NativeWindow::DialogScope(parent_window)) {
   DCHECK_GT(buttons.size(), 0u);
   set_owned_by_client();
 
@@ -174,6 +176,7 @@ string16 MessageDialog::GetWindowTitle() const {
 
 void MessageDialog::WindowClosing() {
   should_close_ = true;
+  dialog_scope_.reset();
 
   if (delete_on_close_) {
     callback_.Run(GetResult());