diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 03:28:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 03:28:46 +0000 |
| commit | 8cfb672c1560ea3354b0a51fa2efca3de8249beb (patch) | |
| tree | 9e4e4dba8001b6b37a6b2b15070544c26f5008be /ash/root_window_controller_unittest.cc | |
| parent | 9bf222b0ada03412fbbb61a5dcf2f6205bb1f0d8 (diff) | |
| download | chromium_src-8cfb672c1560ea3354b0a51fa2efca3de8249beb.zip chromium_src-8cfb672c1560ea3354b0a51fa2efca3de8249beb.tar.gz chromium_src-8cfb672c1560ea3354b0a51fa2efca3de8249beb.tar.bz2 | |
Rework FocusManager as FocusClient.
This allows us to have multiple focus system implementations.
http://crbug.com/162100
R=sky@chromium.org
Review URL: https://codereview.chromium.org/11299219
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller_unittest.cc')
| -rw-r--r-- | ash/root_window_controller_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index c58638a..37bd96a 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc @@ -12,8 +12,8 @@ #include "ash/test/ash_test_base.h" #include "ash/wm/system_modal_container_layout_manager.h" #include "ash/wm/window_util.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/event_generator.h" #include "ui/aura/test/test_window_delegate.h" @@ -150,8 +150,7 @@ TEST_F(RootWindowControllerTest, MoveWindows_Basic) { aura::Window* d2 = aura::test::CreateTestWindowWithDelegate( &delete_on_blur_delegate, 0, gfx::Rect(50, 50, 100, 100), NULL); delete_on_blur_delegate.set_window(d2); - root_windows[0]->GetFocusManager()->SetFocusedWindow( - d2, NULL); + aura::client::GetFocusClient(root_windows[0])->FocusWindow(d2, NULL); tracker.Add(d2); UpdateDisplay("600x600"); |