Rework FocusManager as FocusClient.

ash/wm/window_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 "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/cursor_manager.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/activation_delegate.h"
+#include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
-#include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_event_handler.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/events/event.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/screen.h"
@@ skipping 116 matching lines @@
   scoped_ptr<aura::Window> w123(aura::test::CreateTestWindowWithDelegate(
       w123delegate, -123, gfx::Rect(15, 5, 5, 5), w12.get()));
   scoped_ptr<aura::Window> w13(aura::test::CreateTestWindow(
       SK_ColorGRAY, -13, gfx::Rect(5, 470, 50, 50), w1.get()));
 
   // Click on a sub-window (w121) to focus it.
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                        w121.get());
   generator.ClickLeftButton();
 
-  aura::FocusManager* focus_manager = w121->GetFocusManager();
-  EXPECT_EQ(w121.get(), focus_manager->GetFocusedWindow());
+  aura::client::FocusClient* focus_client =
+      aura::client::GetFocusClient(w121.get());
+  EXPECT_EQ(w121.get(), focus_client->GetFocusedWindow());
 
   // The key press should be sent to the focused sub-window.
   ui::KeyEvent keyev(ui::ET_KEY_PRESSED, ui::VKEY_E, 0, false);
   root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&keyev);
   EXPECT_EQ(ui::VKEY_E, w121delegate->last_key_code());
 
   // Touch on a sub-window (w122) to focus it.
   gfx::Point click_point = w122->bounds().CenterPoint();
   aura::Window::ConvertPointToTarget(w122->parent(), root_window, &click_point);
   ui::TouchEvent touchev(ui::ET_TOUCH_PRESSED, click_point, 0, getTime());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touchev);
-  focus_manager = w122->GetFocusManager();
-  EXPECT_EQ(w122.get(), focus_manager->GetFocusedWindow());
+  focus_client = aura::client::GetFocusClient(w122.get());
+  EXPECT_EQ(w122.get(), focus_client->GetFocusedWindow());
 
   // The key press should be sent to the focused sub-window.
   root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&keyev);
   EXPECT_EQ(ui::VKEY_E, w122delegate->last_key_code());
 
   // Hiding the focused window will set the focus to its parent if
   // it's focusable.
   w122->Hide();
-  EXPECT_EQ(w12->GetFocusManager(), w122->GetFocusManager());
-  EXPECT_EQ(w12.get(), w12->GetFocusManager()->GetFocusedWindow());
+  EXPECT_EQ(aura::client::GetFocusClient(w12.get()),
+            aura::client::GetFocusClient(w122.get()));
+  EXPECT_EQ(w12.get(),
+            aura::client::GetFocusClient(w12.get())->GetFocusedWindow());
 
   // Sets the focus back to w122.
   w122->Show();
   w122->Focus();
-  EXPECT_EQ(w122.get(), w12->GetFocusManager()->GetFocusedWindow());
+  EXPECT_EQ(w122.get(),
+            aura::client::GetFocusClient(w12.get())->GetFocusedWindow());
 
   // Removing the focused window from parent should set the focus to
   // its parent if it's focusable.
   w12->RemoveChild(w122.get());
-  EXPECT_EQ(NULL, w122->GetFocusManager());
-  EXPECT_EQ(w12.get(), w12->GetFocusManager()->GetFocusedWindow());
+  EXPECT_EQ(NULL, aura::client::GetFocusClient(w122.get()));
+  EXPECT_EQ(w12.get(),
+            aura::client::GetFocusClient(w12.get())->GetFocusedWindow());
 
   // Set the focus to w123, but make the w1 not activatable.
   test::TestActivationDelegate activation_delegate(false);
   w123->Focus();
-  EXPECT_EQ(w123.get(), w12->GetFocusManager()->GetFocusedWindow());
+  EXPECT_EQ(w123.get(),
+            aura::client::GetFocusClient(w12.get())->GetFocusedWindow());
   aura::client::SetActivationDelegate(w1.get(), &activation_delegate);
 
   // Hiding the focused window will set the focus to NULL because
   // parent window is not focusable.
   w123->Hide();
-  EXPECT_EQ(w12->GetFocusManager(), w123->GetFocusManager());
-  EXPECT_EQ(NULL, w12->GetFocusManager()->GetFocusedWindow());
+  EXPECT_EQ(aura::client::GetFocusClient(w12.get()),
+            aura::client::GetFocusClient(w123.get()));
+  EXPECT_EQ(NULL, aura::client::GetFocusClient(w12.get())->GetFocusedWindow());
   EXPECT_FALSE(root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&keyev));
 
   // Set the focus back to w123
   aura::client::SetActivationDelegate(w1.get(), NULL);
   w123->Show();
   w123->Focus();
-  EXPECT_EQ(w123.get(), w12->GetFocusManager()->GetFocusedWindow());
+  EXPECT_EQ(w123.get(),
+            aura::client::GetFocusClient(w12.get())->GetFocusedWindow());
   aura::client::SetActivationDelegate(w1.get(), &activation_delegate);
 
   // Removing the focused window will set the focus to NULL because
   // parent window is not focusable.
   w12->RemoveChild(w123.get());
-  EXPECT_EQ(NULL, w123->GetFocusManager());
+  EXPECT_EQ(NULL, aura::client::GetFocusClient(w123.get()));
   EXPECT_FALSE(root_window->AsRootWindowHostDelegate()->OnHostKeyEvent(&keyev));
 }
 
 // Various assertion testing for activating windows.
 TEST_F(WindowManagerTest, ActivateOnMouse) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
       &wd, -1, gfx::Rect(10, 10, 50, 50), NULL));
   d1.SetWindow(w1.get());
   test::TestActivationDelegate d2;
   scoped_ptr<aura::Window> w2(aura::test::CreateTestWindowWithDelegate(
       &wd, -1, gfx::Rect(70, 70, 50, 50), NULL));
   d2.SetWindow(w2.get());
 
-  aura::FocusManager* focus_manager = w1->GetFocusManager();
+  aura::client::FocusClient* focus_client =
+      aura::client::GetFocusClient(w1.get());
 
   d1.Clear();
   d2.Clear();
 
   // Activate window1.
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
-  EXPECT_EQ(w1.get(), focus_manager->GetFocusedWindow());
+  EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
   d1.Clear();
 
   {
     // Click on window2.
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          w2.get());
     generator.ClickLeftButton();
 
     // Window2 should have become active.
     EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
-    EXPECT_EQ(w2.get(), focus_manager->GetFocusedWindow());
+    EXPECT_EQ(w2.get(), focus_client->GetFocusedWindow());
     EXPECT_EQ(0, d1.activated_count());
     EXPECT_EQ(1, d1.lost_active_count());
     EXPECT_EQ(1, d2.activated_count());
     EXPECT_EQ(0, d2.lost_active_count());
     d1.Clear();
     d2.Clear();
   }
 
   {
     // Click back on window1, but set it up so w1 doesn't activate on click.
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          w1.get());
     d1.set_activate(false);
     generator.ClickLeftButton();
 
     // Window2 should still be active and focused.
     EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
-    EXPECT_EQ(w2.get(), focus_manager->GetFocusedWindow());
+    EXPECT_EQ(w2.get(), focus_client->GetFocusedWindow());
     EXPECT_EQ(0, d1.activated_count());
     EXPECT_EQ(0, d1.lost_active_count());
     EXPECT_EQ(0, d2.activated_count());
     EXPECT_EQ(0, d2.lost_active_count());
     d1.Clear();
     d2.Clear();
   }
 
   // Destroy window2, this should make window1 active.
   d1.set_activate(true);
   w2.reset();
   EXPECT_EQ(0, d2.activated_count());
   EXPECT_EQ(0, d2.lost_active_count());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
-  EXPECT_EQ(w1.get(), focus_manager->GetFocusedWindow());
+  EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
 
   // Clicking an active window with a child shouldn't steal the
   // focus from the child.
   {
     scoped_ptr<aura::Window> w11(CreateTestWindowWithDelegate(
           &wd, -1, gfx::Rect(10, 10, 10, 10), w1.get()));
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          w11.get());
     // First set the focus to the child |w11|.
     generator.ClickLeftButton();
-    EXPECT_EQ(w11.get(), focus_manager->GetFocusedWindow());
+    EXPECT_EQ(w11.get(), focus_client->GetFocusedWindow());
     EXPECT_EQ(w1.get(), wm::GetActiveWindow());
 
     // Then click the parent active window. The focus shouldn't move.
     gfx::Point left_top = w1->bounds().origin();
     aura::Window::ConvertPointToTarget(w1->parent(), root_window, &left_top);
     left_top.Offset(1, 1);
     generator.MoveMouseTo(left_top);
     generator.ClickLeftButton();
-    EXPECT_EQ(w11.get(), focus_manager->GetFocusedWindow());
+    EXPECT_EQ(w11.get(), focus_client->GetFocusedWindow());
     EXPECT_EQ(w1.get(), wm::GetActiveWindow());
   }
 
   // Clicking on a non-focusable window inside a background window should still
   // give focus to the background window.
   {
     NonFocusableDelegate nfd;
     scoped_ptr<aura::Window> w11(CreateTestWindowWithDelegate(
           &nfd, -1, gfx::Rect(10, 10, 10, 10), w1.get()));
     // Move focus to |w2| first.
     scoped_ptr<aura::Window> w2(aura::test::CreateTestWindowWithDelegate(
           &wd, -1, gfx::Rect(70, 70, 50, 50), NULL));
     aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                          w2.get());
     generator.ClickLeftButton();
-    EXPECT_EQ(w2.get(), focus_manager->GetFocusedWindow());
+    EXPECT_EQ(w2.get(), focus_client->GetFocusedWindow());
     EXPECT_FALSE(w11->CanFocus());
 
     // Click on |w11|. This should focus w1.
     generator.MoveMouseToCenterOf(w11.get());
     generator.ClickLeftButton();
-    EXPECT_EQ(w1.get(), focus_manager->GetFocusedWindow());
+    EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   }
 }
 
 // Essentially the same as ActivateOnMouse, but for touch events.
 TEST_F(WindowManagerTest, ActivateOnTouch) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
   test::TestActivationDelegate d1;
   aura::test::TestWindowDelegate wd;
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
       &wd, -1, gfx::Rect(10, 10, 50, 50), NULL));
   d1.SetWindow(w1.get());
   test::TestActivationDelegate d2;
   scoped_ptr<aura::Window> w2(aura::test::CreateTestWindowWithDelegate(
       &wd, -2, gfx::Rect(70, 70, 50, 50), NULL));
   d2.SetWindow(w2.get());
 
-  aura::FocusManager* focus_manager = w1->GetFocusManager();
+  aura::client::FocusClient* focus_client =
+      aura::client::GetFocusClient(w1.get());
 
   d1.Clear();
   d2.Clear();
 
   // Activate window1.
   wm::ActivateWindow(w1.get());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
-  EXPECT_EQ(w1.get(), focus_manager->GetFocusedWindow());
+  EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
   d1.Clear();
 
   // Touch window2.
   gfx::Point press_point = w2->bounds().CenterPoint();
   aura::Window::ConvertPointToTarget(w2->parent(), root_window, &press_point);
   ui::TouchEvent touchev1(ui::ET_TOUCH_PRESSED, press_point, 0, getTime());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touchev1);
 
   // Window2 should have become active.
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
-  EXPECT_EQ(w2.get(), focus_manager->GetFocusedWindow());
+  EXPECT_EQ(w2.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(0, d1.activated_count());
   EXPECT_EQ(1, d1.lost_active_count());
   EXPECT_EQ(1, d2.activated_count());
   EXPECT_EQ(0, d2.lost_active_count());
   d1.Clear();
   d2.Clear();
 
   // Touch window1, but set it up so w1 doesn't activate on touch.
   press_point = w1->bounds().CenterPoint();
   aura::Window::ConvertPointToTarget(w1->parent(), root_window, &press_point);
   d1.set_activate(false);
   ui::TouchEvent touchev2(ui::ET_TOUCH_PRESSED, press_point, 1, getTime());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touchev2);
 
   // Window2 should still be active and focused.
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
-  EXPECT_EQ(w2.get(), focus_manager->GetFocusedWindow());
+  EXPECT_EQ(w2.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(0, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
   EXPECT_EQ(0, d2.activated_count());
   EXPECT_EQ(0, d2.lost_active_count());
   d1.Clear();
   d2.Clear();
 
   // Destroy window2, this should make window1 active.
   d1.set_activate(true);
   w2.reset();
   EXPECT_EQ(0, d2.activated_count());
   EXPECT_EQ(0, d2.lost_active_count());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
-  EXPECT_EQ(w1.get(), focus_manager->GetFocusedWindow());
+  EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
 }
 
 TEST_F(WindowManagerTest, MouseEventCursors) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
   // Create a window.
   const int kWindowLeft = 123;
   const int kWindowTop = 45;
@@ skipping 109 matching lines @@
   d1.SetWindow(w1.get());
   w1->Show();
 
   gfx::Point miss_point(5, 5);
   transform.TransformPoint(miss_point);
   ui::MouseEvent mouseev1(ui::ET_MOUSE_PRESSED,
                           miss_point,
                           miss_point,
                           ui::EF_LEFT_MOUSE_BUTTON);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseev1);
-  EXPECT_FALSE(w1->GetFocusManager()->GetFocusedWindow());
+  EXPECT_EQ(NULL, aura::client::GetFocusClient(w1.get())->GetFocusedWindow());
   ui::MouseEvent mouseup(ui::ET_MOUSE_RELEASED,
                          miss_point,
                          miss_point,
                          ui::EF_LEFT_MOUSE_BUTTON);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseup);
 
   gfx::Point hit_point(5, 15);
   transform.TransformPoint(hit_point);
   ui::MouseEvent mouseev2(ui::ET_MOUSE_PRESSED,
                           hit_point,
                           hit_point,
                           ui::EF_LEFT_MOUSE_BUTTON);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseev2);
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
-  EXPECT_EQ(w1.get(), w1->GetFocusManager()->GetFocusedWindow());
+  EXPECT_EQ(w1.get(),
+            aura::client::GetFocusClient(w1.get())->GetFocusedWindow());
 }
 
 TEST_F(WindowManagerTest, AdditionalFilters) {
   // The IME event filter interferes with the basic key event propagation we
   // attempt to do here, so we remove it.
   Shell::TestApi shell_test(Shell::GetInstance());
   Shell::GetInstance()->RemovePreTargetHandler(
       shell_test.input_method_event_filter());
 
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
@@ skipping 113 matching lines @@
   EXPECT_TRUE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
   EXPECT_FALSE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_released2);
   EXPECT_TRUE(cursor_manager->cursor_visible());
 }
 
 }  // namespace ash