Renamed BrowserWindow::GetNativeHandle() to GetNativeWindow()

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 520 matching lines @@
   window_ = CreateBrowserWindow();
   fullscreen_controller_ = new FullscreenController(window_, profile_, this);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Set the app user model id for this application to that of the application
   // name.  See http://crbug.com/7028.
   ui::win::SetAppIdForWindow(
       is_app() && !is_type_panel() ?
       ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) :
       ShellIntegration::GetChromiumAppId(profile_->GetPath()),
-      window()->GetNativeHandle());
+      window()->GetNativeWindow());
 
   if (is_type_panel()) {
     ui::win::SetAppIconForWindow(ShellIntegration::GetChromiumIconPath(),
-                                 window()->GetNativeHandle());
+                                 window()->GetNativeWindow());
   }
 #endif
 
   // Create the extension window controller before sending notifications.
   extension_window_controller_.reset(
       new BrowserExtensionWindowController(this));
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BROWSER_WINDOW_READY,
       content::Source<Browser>(this),
@@ skipping 644 matching lines @@
 }
 
 void Browser::CloseTabContents(WebContents* contents) {
   CloseContents(contents);
 }
 
 gfx::NativeWindow Browser::BrowserShowWebDialog(
     WebDialogDelegate* delegate,
     gfx::NativeWindow parent_window) {
   if (!parent_window)
-    parent_window = window_->GetNativeHandle();
+    parent_window = window_->GetNativeWindow();
 
   return browser::ShowWebDialog(parent_window, profile_, this, delegate);
 }
 
 void Browser::BrowserRenderWidgetShowing() {
   RenderWidgetShowing();
 }
 
 void Browser::BookmarkBarSizeChanged(bool is_animating) {
   window_->ToolbarSizeChanged(is_animating);
@@ skipping 564 matching lines @@
 }
 
 void Browser::OpenFile() {
   content::RecordAction(UserMetricsAction("OpenFile"));
   if (!select_file_dialog_.get())
     select_file_dialog_ = SelectFileDialog::Create(this);
 
   const FilePath directory = profile_->last_selected_directory();
 
   // TODO(beng): figure out how to juggle this.
-  gfx::NativeWindow parent_window = window_->GetNativeHandle();
+  gfx::NativeWindow parent_window = window_->GetNativeWindow();
   select_file_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,
                                   string16(), directory,
                                   NULL, 0, FILE_PATH_LITERAL(""),
                                   GetActiveWebContents(),
                                   parent_window, NULL);
 }
 
 void Browser::OpenCreateShortcutsDialog() {
   content::RecordAction(UserMetricsAction("CreateShortcut"));
 #if !defined(OS_MACOSX)
@@ skipping 599 matching lines @@
   // displaying a favicon, which controls the throbber. If we updated it here,
   // the throbber will show the default favicon for a split second when
   // navigating away from the new tab page.
   ScheduleUIUpdate(contents->web_contents(), content::INVALIDATE_TYPE_URL);
 
   if (contents_is_selected)
     contents->web_contents()->Focus();
 }
 
 void Browser::ShowCollectedCookiesDialog(TabContents* tab_contents) {
-  browser::ShowCollectedCookiesDialog(window()->GetNativeHandle(),
+  browser::ShowCollectedCookiesDialog(window()->GetNativeWindow(),
                                       tab_contents);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, PageNavigator implementation:
 
 WebContents* Browser::OpenURL(const OpenURLParams& params) {
   return OpenURLFromTab(NULL, params);
 }
 
@@ skipping 2747 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }