Renamed BrowserWindow::GetNativeHandle() to GetNativeWindow()

chrome/browser/keyboard_access_browsertest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 // This functionality currently works on Windows and on Linux when
 // toolkit_views is defined (i.e. for Chrome OS). It's not needed
 // on the Mac, and it's not yet implemented on Linux.
 #if defined(TOOLKIT_VIEWS)
 
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
@@ skipping 11 matching lines @@
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // An async version of SendKeyPressSync since we don't get notified when a
 // menu is showing.
 void SendKeyPress(Browser* browser, ui::KeyboardCode key) {
   ASSERT_TRUE(ui_controls::SendKeyPress(
-      browser->window()->GetNativeHandle(), key, false, false, false, false));
+      browser->window()->GetNativeWindow(), key, false, false, false, false));
 }
 
 // Helper class that waits until the focus has changed to a view other
 // than the one with the provided view id.
 class ViewFocusChangeWaiter : public views::FocusChangeListener {
  public:
   ViewFocusChangeWaiter(views::FocusManager* focus_manager,
                         int previous_view_id)
       : focus_manager_(focus_manager),
         previous_view_id_(previous_view_id),
@@ skipping 65 matching lines @@
   // Use the keyboard to select "New Tab" from the app menu.
   // This test depends on the fact that there is one menu and that
   // New Tab is the first item in the menu. If the menus change,
   // this test will need to be changed to reflect that.
   //
   // If alternate_key_sequence is true, use "Alt" instead of "F10" to
   // open the menu bar, and "Down" instead of "Enter" to open a menu.
   void TestMenuKeyboardAccess(bool alternate_key_sequence, bool shift);
 
   int GetFocusedViewID() {
-    gfx::NativeWindow window = browser()->window()->GetNativeHandle();
+    gfx::NativeWindow window = browser()->window()->GetNativeWindow();
     views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
     const views::FocusManager* focus_manager = widget->GetFocusManager();
     const views::View* focused_view = focus_manager->GetFocusedView();
     return focused_view ? focused_view->id() : -1;
   }
 
   void WaitForFocusedViewIDToChange(int original_view_id) {
     if (GetFocusedViewID() != original_view_id)
       return;
-    gfx::NativeWindow window = browser()->window()->GetNativeHandle();
+    gfx::NativeWindow window = browser()->window()->GetNativeWindow();
     views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
     views::FocusManager* focus_manager = widget->GetFocusManager();
     ViewFocusChangeWaiter waiter(focus_manager, original_view_id);
     waiter.Wait();
   }
 
   DISALLOW_COPY_AND_ASSIGN(KeyboardAccessTest);
 };
 
 void KeyboardAccessTest::TestMenuKeyboardAccess(bool alternate_key_sequence,
@@ skipping 108 matching lines @@
   ASSERT_EQ(2, browser()->active_index());
 
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_W, true, false, false, false));
   ASSERT_EQ(0, browser()->active_index());
 }
 
 }  // namespace
 
 #endif  // defined(TOOLKIT_VIEWS)