Rework FocusManager as FocusClient.

ash/extended_desktop_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 "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "base/string_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/capture_client.h"
-#include "ui/aura/focus_manager.h"
+#include "ui/aura/client/focus_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/events/event_handler.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/widget/widget.h"
@@ skipping 81 matching lines @@
   UpdateDisplay("1000x600,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   // All root windows must have the root window controller.
   ASSERT_EQ(2U, root_windows.size());
   for (Shell::RootWindowList::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     EXPECT_TRUE(GetRootWindowController(*iter) != NULL);
   }
   // Make sure root windows share the same controllers.
-  EXPECT_EQ(root_windows[0]->GetFocusManager(),
-            root_windows[1]->GetFocusManager());
+  EXPECT_EQ(aura::client::GetFocusClient(root_windows[0]),
+            aura::client::GetFocusClient(root_windows[1]));
   EXPECT_EQ(aura::client::GetActivationClient(root_windows[0]),
             aura::client::GetActivationClient(root_windows[1]));
   EXPECT_EQ(aura::client::GetCaptureClient(root_windows[0]),
             aura::client::GetCaptureClient(root_windows[1]));
 }
 
 TEST_F(ExtendedDesktopTest, Activation) {
   UpdateDisplay("1000x600,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   views::Widget* widget_on_1st = CreateTestWidget(gfx::Rect(10, 10, 100, 100));
   views::Widget* widget_on_2nd =
       CreateTestWidget(gfx::Rect(1200, 10, 100, 100));
   EXPECT_EQ(root_windows[0], widget_on_1st->GetNativeView()->GetRootWindow());
   EXPECT_EQ(root_windows[1], widget_on_2nd->GetNativeView()->GetRootWindow());
 
   EXPECT_EQ(widget_on_2nd->GetNativeView(),
-            root_windows[0]->GetFocusManager()->GetFocusedWindow());
+            aura::client::GetFocusClient(root_windows[0])->GetFocusedWindow());
   EXPECT_TRUE(wm::IsActiveWindow(widget_on_2nd->GetNativeView()));
 
   aura::test::EventGenerator generator_1st(root_windows[0]);
   aura::test::EventGenerator generator_2nd(root_windows[1]);
 
   // Clicking a window changes the active window and active root window.
   generator_1st.MoveMouseToCenterOf(widget_on_1st->GetNativeView());
   generator_1st.ClickLeftButton();
 
   EXPECT_EQ(widget_on_1st->GetNativeView(),
-            root_windows[0]->GetFocusManager()->GetFocusedWindow());
+            aura::client::GetFocusClient(root_windows[0])->GetFocusedWindow());
   EXPECT_TRUE(wm::IsActiveWindow(widget_on_1st->GetNativeView()));
 
   generator_2nd.MoveMouseToCenterOf(widget_on_2nd->GetNativeView());
   generator_2nd.ClickLeftButton();
 
   EXPECT_EQ(widget_on_2nd->GetNativeView(),
-            root_windows[0]->GetFocusManager()->GetFocusedWindow());
+            aura::client::GetFocusClient(root_windows[0])->GetFocusedWindow());
   EXPECT_TRUE(wm::IsActiveWindow(widget_on_2nd->GetNativeView()));
 }
 
 TEST_F(ExtendedDesktopTest, SystemModal) {
   UpdateDisplay("1000x600,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   views::Widget* widget_on_1st = CreateTestWidget(gfx::Rect(10, 10, 100, 100));
   EXPECT_TRUE(wm::IsActiveWindow(widget_on_1st->GetNativeView()));
   EXPECT_EQ(root_windows[0], widget_on_1st->GetNativeView()->GetRootWindow());
@@ skipping 493 matching lines @@
   views::Textfield* textfield = new views::Textfield;
   lock_widget->SetContentsView(textfield);
 
   ash::Shell::GetContainer(
       Shell::GetPrimaryRootWindow(),
       ash::internal::kShellWindowId_LockScreenContainer)->
       AddChild(lock_widget->GetNativeView());
   lock_widget->Show();
   textfield->RequestFocus();
 
-  aura::FocusManager* focus_manager = root_windows[0]->GetFocusManager();
-  EXPECT_EQ(lock_widget->GetNativeView(), focus_manager->GetFocusedWindow());
+  aura::client::FocusClient* focus_client =
+      aura::client::GetFocusClient(root_windows[0]);
+  EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
 
   // The lock window should get events on both root windows.
   aura::test::EventGenerator generator1(root_windows[0]);
   generator1.PressKey(ui::VKEY_A, 0);
   generator1.ReleaseKey(ui::VKEY_A, 0);
-  EXPECT_EQ(lock_widget->GetNativeView(), focus_manager->GetFocusedWindow());
+  EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
   EXPECT_EQ("a", UTF16ToASCII(textfield->text()));
 
   aura::test::EventGenerator generator2(root_windows[1]);
   generator2.PressKey(ui::VKEY_B, 0);
   generator2.ReleaseKey(ui::VKEY_B, 0);
-  EXPECT_EQ(lock_widget->GetNativeView(), focus_manager->GetFocusedWindow());
+  EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
   EXPECT_EQ("ab", UTF16ToASCII(textfield->text()));
 
   // Deleting 2nd display. The lock window still should get the events.
   UpdateDisplay("100x100");
   generator2.PressKey(ui::VKEY_C, 0);
   generator2.ReleaseKey(ui::VKEY_C, 0);
-  EXPECT_EQ(lock_widget->GetNativeView(), focus_manager->GetFocusedWindow());
+  EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
   EXPECT_EQ("abc", UTF16ToASCII(textfield->text()));
 
   // Creating 2nd display again, and lock window still should get events
   // on both root windows.
   UpdateDisplay("100x100,200x200");
   root_windows = Shell::GetAllRootWindows();
   generator1.PressKey(ui::VKEY_D, 0);
   generator1.ReleaseKey(ui::VKEY_D, 0);
-  EXPECT_EQ(lock_widget->GetNativeView(), focus_manager->GetFocusedWindow());
+  EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
   EXPECT_EQ("abcd", UTF16ToASCII(textfield->text()));
 
   aura::test::EventGenerator generator22(root_windows[1]);
   generator22.PressKey(ui::VKEY_E, 0);
   generator22.ReleaseKey(ui::VKEY_E, 0);
-  EXPECT_EQ(lock_widget->GetNativeView(), focus_manager->GetFocusedWindow());
+  EXPECT_EQ(lock_widget->GetNativeView(), focus_client->GetFocusedWindow());
   EXPECT_EQ("abcde", UTF16ToASCII(textfield->text()));
 }
 
 }  // namespace internal
 }  // namespace ash