Renamed BrowserWindow::GetNativeHandle() to GetNativeWindow()

This is in preparation for adding a GetNativeWindow() method to
the BaseWindow interface.

BUG=None
TEST=None

Review URL: https://chromiumcodereview.appspot.com/10538039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141071 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 22 insertions, 22 deletions

diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript.mm b/chrome/browser/ui/cocoa/applescript/window_applescript.mm
index 93d414c..9270cae 100644
--- a/chrome/browser/ui/cocoa/applescript/window_applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/window_applescript.mm
@@ -99,7 +99,7 @@
 - (NSWindow*)nativeHandle {
   // window() can be NULL during startup.
   if (browser_->window())
-    return browser_->window()->GetNativeHandle();
+    return browser_->window()->GetNativeWindow();
   return nil;
 }
 
diff --git a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm
index a03c02b..a9ff524 100644
--- a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm
+++ b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm
@@ -161,7 +161,7 @@ const CGFloat kMenuYOffsetAdjust = 1.0;
   DCHECK(browser_->command_updater()->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
 
   NSWindowController* wc =
-      [browser_->window()->GetNativeHandle() windowController];
+      [browser_->window()->GetNativeWindow() windowController];
   if ([wc isKindOfClass:[BrowserWindowController class]]) {
     [static_cast<BrowserWindowController*>(wc)
         lockBarVisibilityForOwner:self withAnimation:NO delay:NO];
@@ -203,7 +203,7 @@ const CGFloat kMenuYOffsetAdjust = 1.0;
 
 - (void)bubbleWillClose:(NSNotification*)notif {
   NSWindowController* wc =
-      [browser_->window()->GetNativeHandle() windowController];
+      [browser_->window()->GetNativeWindow() windowController];
   if ([wc isKindOfClass:[BrowserWindowController class]]) {
     [static_cast<BrowserWindowController*>(wc)
         releaseBarVisibilityForOwner:self withAnimation:YES delay:NO];
@@ -279,7 +279,7 @@ const CGFloat kMenuYOffsetAdjust = 1.0;
     return;
 
   NSWindowController* wc =
-      [browser_->window()->GetNativeHandle() windowController];
+      [browser_->window()->GetNativeWindow() windowController];
   if (![wc isKindOfClass:[BrowserWindowController class]])
     return;
 
diff --git a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm
index 1f9466f..ba997e1 100644
--- a/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm
@@ -64,7 +64,7 @@ const CGFloat kLabelInset = 49.0;
       NULL, parentBrowser);
 
   if ((self = [self initWithModel:model
-                     parentWindow:parentBrowser->window()->GetNativeHandle()
+                     parentWindow:parentBrowser->window()->GetNativeWindow()
                        anchoredAt:point])) {
   }
   return self;
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
index c4707bc..3b5945b 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
@@ -46,7 +46,7 @@ class BrowserWindowCocoa : public BrowserWindow,
   virtual bool IsActive() const OVERRIDE;
   virtual void FlashFrame(bool flash) OVERRIDE;
   virtual bool IsAlwaysOnTop() const OVERRIDE;
-  virtual gfx::NativeWindow GetNativeHandle() OVERRIDE;
+  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
   virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;
   virtual StatusBubble* GetStatusBubble() OVERRIDE;
   virtual void ToolbarSizeChanged(bool is_animating) OVERRIDE;
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index 9f75da3..335b1f7 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -200,7 +200,7 @@ bool BrowserWindowCocoa::IsActive() const {
   return [window() isKeyWindow];
 }
 
-gfx::NativeWindow BrowserWindowCocoa::GetNativeHandle() {
+gfx::NativeWindow BrowserWindowCocoa::GetNativeWindow() {
   return window();
 }
 
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 855bf0d..9fdb143 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1353,7 +1353,7 @@ enum {
   // Get the new controller by asking the new window for its delegate.
   BrowserWindowController* controller =
       reinterpret_cast<BrowserWindowController*>(
-          [newBrowser->window()->GetNativeHandle() delegate]);
+          [newBrowser->window()->GetNativeWindow() delegate]);
   DCHECK(controller && [controller isKindOfClass:[TabWindowController class]]);
 
   // Force the added tab to the right size (remove stretching.)
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
index bc2bed0..de0b8c4 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
@@ -123,7 +123,7 @@ TEST_F(BrowserWindowControllerTest, TestNormal) {
   // popup_browser will be owned by its window.
   Browser* popup_browser(Browser::CreateWithParams(
       Browser::CreateParams(Browser::TYPE_POPUP, profile())));
-  NSWindow *cocoaWindow = popup_browser->window()->GetNativeHandle();
+  NSWindow *cocoaWindow = popup_browser->window()->GetNativeWindow();
   BrowserWindowController* controller =
       static_cast<BrowserWindowController*>([cocoaWindow windowController]);
   ASSERT_TRUE([controller isKindOfClass:[BrowserWindowController class]]);
@@ -139,7 +139,7 @@ TEST_F(BrowserWindowControllerTest, TestSetBounds) {
   Browser::CreateParams params(Browser::TYPE_TABBED, profile());
   params.initial_bounds = gfx::Rect(0, 0, 50, 50);
   Browser* browser = Browser::CreateWithParams(params);
-  NSWindow *cocoaWindow = browser->window()->GetNativeHandle();
+  NSWindow *cocoaWindow = browser->window()->GetNativeWindow();
   BrowserWindowController* controller =
     static_cast<BrowserWindowController*>([cocoaWindow windowController]);
 
@@ -164,7 +164,7 @@ TEST_F(BrowserWindowControllerTest, TestSetBoundsPopup) {
   Browser::CreateParams params(Browser::TYPE_POPUP, profile());
   params.initial_bounds = gfx::Rect(0, 0, 50, 50);
   Browser* browser = Browser::CreateWithParams(params);
-  NSWindow *cocoaWindow = browser->window()->GetNativeHandle();
+  NSWindow *cocoaWindow = browser->window()->GetNativeWindow();
   BrowserWindowController* controller =
     static_cast<BrowserWindowController*>([cocoaWindow windowController]);
 
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm
index 809c575..a3248d6 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm
@@ -333,7 +333,7 @@ void ShowExtensionInstallDialogImpl(
     return;
   }
 
-  gfx::NativeWindow native_window = window->GetNativeHandle();
+  gfx::NativeWindow native_window = window->GetNativeWindow();
 
   ExtensionInstallDialogController* controller =
       [[ExtensionInstallDialogController alloc]
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm
index 678f83c..a19bee4 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm
@@ -65,7 +65,7 @@ void ShowExtensionInstalledBubble(
     // The controller is deallocated when the window is closed, so no need to
     // worry about it here.
     [[ExtensionInstalledBubbleController alloc]
-        initWithParentWindow:browser->window()->GetNativeHandle()
+        initWithParentWindow:browser->window()->GetNativeWindow()
                    extension:extension
                       bundle:NULL
                      browser:browser
@@ -85,7 +85,7 @@ void extensions::BundleInstaller::ShowInstalledBubble(
   // The controller is deallocated when the window is closed, so no need to
   // worry about it here.
   [[ExtensionInstalledBubbleController alloc]
-        initWithParentWindow:browser->window()->GetNativeHandle()
+        initWithParentWindow:browser->window()->GetNativeWindow()
                    extension:NULL
                       bundle:bundle
                      browser:browser
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
index c49fad9..6929c37 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
@@ -49,7 +49,7 @@ class ExtensionInstalledBubbleControllerTest : public CocoaProfileTest {
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
-    window_ = CreateBrowserWindow()->GetNativeHandle();
+    window_ = CreateBrowserWindow()->GetNativeWindow();
     icon_ = LoadTestIcon();
   }
 
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
index 0fb5024..2cd3ffe 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
@@ -253,7 +253,7 @@ class DevtoolsNotificationBridge : public content::NotificationObserver {
   // closed, so no need to do that here.
   gPopup = [[ExtensionPopupController alloc]
       initWithHost:host
-      parentWindow:browser->window()->GetNativeHandle()
+      parentWindow:browser->window()->GetNativeWindow()
         anchoredAt:anchoredAt
      arrowLocation:arrowLocation
            devMode:devMode];
diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm
index bccec1c..30197e8 100644
--- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm
@@ -78,7 +78,7 @@ class FullscreenExitBubbleControllerTest : public CocoaProfileTest {
 
 TEST_F(FullscreenExitBubbleControllerTest, DenyExitsFullscreen) {
   CreateBrowserWindow();
-  NSWindow* window = browser()->window()->GetNativeHandle();
+  NSWindow* window = browser()->window()->GetNativeWindow();
   BrowserWindowController* bwc = [BrowserWindowController
       browserWindowControllerForWindow:window];
 
diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
index 1d1c4d4..bf069f2 100644
--- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
@@ -53,7 +53,7 @@ class Bridge : public GlobalErrorBubbleViewBase {
 
 + (GlobalErrorBubbleViewBase*)showForBrowser:(Browser*)browser
     error:(const base::WeakPtr<GlobalError>&)error {
-  NSWindow* parentWindow = browser->window()->GetNativeHandle();
+  NSWindow* parentWindow = browser->window()->GetNativeWindow();
   BrowserWindowController* bwc = [BrowserWindowController
       browserWindowControllerForWindow:parentWindow];
   NSView* wrenchButton = [[bwc toolbarController] wrenchButton];
diff --git a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm
index 7ee0906..3aff093 100644
--- a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm
@@ -36,7 +36,7 @@ class TabposeWindowTest : public CocoaProfileTest {
 // Check that this doesn't leak.
 TEST_F(TabposeWindowTest, TestShow) {
   BrowserWindow* browser_window = CreateBrowserWindow();
-  NSWindow* parent = browser_window->GetNativeHandle();
+  NSWindow* parent = browser_window->GetNativeWindow();
 
   [parent orderFront:nil];
   EXPECT_TRUE([parent isVisible]);
@@ -58,7 +58,7 @@ TEST_F(TabposeWindowTest, TestShow) {
 
 TEST_F(TabposeWindowTest, TestModelObserver) {
   BrowserWindow* browser_window = CreateBrowserWindow();
-  NSWindow* parent = browser_window->GetNativeHandle();
+  NSWindow* parent = browser_window->GetNativeWindow();
   [parent orderFront:nil];
 
   // Add a few tabs to the tab strip model.
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
index 038cbfb..207476b 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
@@ -63,7 +63,7 @@ class TabStripControllerTest : public CocoaProfileTest {
     ASSERT_TRUE(browser());
 
     BrowserWindow* browser_window = CreateBrowserWindow();
-    NSWindow* window = browser_window->GetNativeHandle();
+    NSWindow* window = browser_window->GetNativeWindow();
     NSView* parent = [window contentView];
     NSRect content_frame = [parent frame];
 
diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
index 405c295..a50e741 100644
--- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
+++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
@@ -33,7 +33,7 @@ class ViewIDTest : public InProcessBrowserTest {
 
   void CheckViewID(ViewID view_id, bool should_have) {
     if (!root_window_)
-      root_window_ = browser()->window()->GetNativeHandle();
+      root_window_ = browser()->window()->GetNativeWindow();
 
     ASSERT_TRUE(root_window_);
     NSView* view = view_id_util::GetView(root_window_, view_id);