Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2975)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/window_manager_unittest.cc

Issue 11299219: Rework FocusManager as FocusClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/maximize_bubble_controller.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_manager_unittest.cc
===================================================================
--- ash/wm/window_manager_unittest.cc (revision 169818)
+++ ash/wm/window_manager_unittest.cc (working copy)
@@ -11,8 +11,8 @@
#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"
@@ -149,8 +149,9 @@
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);
@@ -162,8 +163,8 @@
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);
@@ -172,44 +173,51 @@
// 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));
}
@@ -227,7 +235,8 @@
&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();
@@ -235,7 +244,7 @@
// 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();
@@ -248,7 +257,7 @@
// 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());
@@ -266,7 +275,7 @@
// 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());
@@ -281,7 +290,7 @@
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());
@@ -294,7 +303,7 @@
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.
@@ -303,7 +312,7 @@
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());
}
@@ -319,13 +328,13 @@
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());
}
}
@@ -343,7 +352,8 @@
&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();
@@ -351,7 +361,7 @@
// 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();
@@ -364,7 +374,7 @@
// 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());
@@ -381,7 +391,7 @@
// 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());
@@ -395,7 +405,7 @@
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());
}
@@ -525,7 +535,7 @@
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,
@@ -540,7 +550,8 @@
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) {
« no previous file with comments | « ash/wm/maximize_bubble_controller.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698