Plumb ClearNativeFocus to DesktopRootWindowHostWin.

ui/views/focus/focus_manager_unittest.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 <utility>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/focus/focus_manager_test.h"
 #include "ui/views/focus/widget_focus_manager.h"
 #include "ui/views/widget/widget.h"
 
-#if !defined(USE_AURA)
+#if defined(USE_AURA)
+#include "ui/aura/focus_manager.h"
+#include "ui/aura/window.h"
+#else
 #include "ui/views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #endif
 
 namespace views {
 
+void FocusNativeView(gfx::NativeView view) {
+#if defined(USE_AURA)
+  view->GetFocusManager()->SetFocusedWindow(view, NULL);
+#elif defined(OS_WIN)
+  SetFocus(view);
+#else
+#error
+#endif
+}
+
 enum FocusTestEventType {
   ON_FOCUS = 0,
   ON_BLUR
 };
 
 struct FocusTestEvent {
   FocusTestEvent(FocusTestEventType type, int view_id)
       : type(type),
         view_id(view_id) {
   }
@@ skipping 96 matching lines @@
   scoped_ptr<Widget> widget1(new Widget);
   widget1->Init(params);
   widget1->Show();
 
   scoped_ptr<Widget> widget2(new Widget);
   widget2->Init(params);
   widget2->Show();
 
   widget_listener.ClearFocusChanges();
   gfx::NativeView native_view1 = widget1->GetNativeView();
-  GetWidget()->FocusNativeView(native_view1);
+  FocusNativeView(native_view1);
   ASSERT_EQ(2, static_cast<int>(widget_listener.focus_changes().size()));
   EXPECT_EQ(native_view1, widget_listener.focus_changes()[0].second);
   EXPECT_EQ(native_view1, widget_listener.focus_changes()[1].second);
 
   widget_listener.ClearFocusChanges();
   gfx::NativeView native_view2 = widget2->GetNativeView();
-  GetWidget()->FocusNativeView(native_view2);
+  FocusNativeView(native_view2);
   ASSERT_EQ(2, static_cast<int>(widget_listener.focus_changes().size()));
   EXPECT_EQ(NativeViewPair(native_view1, native_view2),
             widget_listener.focus_changes()[0]);
   EXPECT_EQ(NativeViewPair(native_view1, native_view2),
             widget_listener.focus_changes()[1]);
 }
 
 #if !defined(USE_AURA)
 class TestTextfield : public Textfield {
  public:
@@ skipping 18 matching lines @@
   TestTabbedPane* tabbed_pane = new TestTabbedPane();
   tabbed_pane->set_use_native_win_control(true);
   TestTextfield* textfield2 = new TestTextfield();
 
   GetContentsView()->AddChildView(textfield);
   GetContentsView()->AddChildView(tabbed_pane);
 
   tabbed_pane->AddTab(ASCIIToUTF16("Awesome textfield"), textfield2);
 
   // Simulate the native view getting the native focus (such as by user click).
-  GetWidget()->FocusNativeView(textfield->TestGetNativeControlView());
+  FocusNativeView(textfield->TestGetNativeControlView());
   EXPECT_EQ(textfield, GetFocusManager()->GetFocusedView());
 
-  GetWidget()->FocusNativeView(tabbed_pane->TestGetNativeControlView());
+  FocusNativeView(tabbed_pane->TestGetNativeControlView());
   EXPECT_EQ(tabbed_pane, GetFocusManager()->GetFocusedView());
 
-  GetWidget()->FocusNativeView(textfield2->TestGetNativeControlView());
+  FocusNativeView(textfield2->TestGetNativeControlView());
   EXPECT_EQ(textfield2, GetFocusManager()->GetFocusedView());
 }
 #endif
 
 // There is no tabbed pane in Aura.
 #if !defined(USE_AURA)
 TEST_F(FocusManagerTest, ContainsView) {
   View* view = new View();
   scoped_ptr<View> detached_view(new View());
   TabbedPane* tabbed_pane = new TabbedPane();
@@ skipping 436 matching lines @@
 
   // Test window, button and focus manager should all be destructed.
   ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));
 
   // Focus manager should be the last one to destruct.
   ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
 }
 #endif
 
 }  // namespace views