diff options
| author | oshima <oshima@chromium.org> | 2015-07-27 18:18:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-28 01:19:26 +0000 |
| commit | e28189248660c42b8e0cb9ad973638d7260b47b7 (patch) | |
| tree | 90109ef81a619744a85b920d246f6d290c5c7a22 /ash/sticky_keys | |
| parent | 4bf2ca554347fc20e1649e5ff4cf700d9fbd713a (diff) | |
| download | chromium_src-e28189248660c42b8e0cb9ad973638d7260b47b7.zip chromium_src-e28189248660c42b8e0cb9ad973638d7260b47b7.tar.gz chromium_src-e28189248660c42b8e0cb9ad973638d7260b47b7.tar.bz2 | |
Rename DisplayController to WindowTreeHostManager
This class manages WTH <-> display mapping, and WTHManager is more appropriate than DisplayController.
BUG=None
Review URL: https://codereview.chromium.org/1262483003
Cr-Commit-Position: refs/heads/master@{#340624}
Diffstat (limited to 'ash/sticky_keys')
| -rw-r--r-- | ash/sticky_keys/sticky_keys_overlay_unittest.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ash/sticky_keys/sticky_keys_overlay_unittest.cc b/ash/sticky_keys/sticky_keys_overlay_unittest.cc index 2566a8b..d28c536 100644 --- a/ash/sticky_keys/sticky_keys_overlay_unittest.cc +++ b/ash/sticky_keys/sticky_keys_overlay_unittest.cc @@ -4,8 +4,8 @@ #include "ash/sticky_keys/sticky_keys_overlay.h" -#include "ash/display/display_controller.h" #include "ash/display/display_manager.h" +#include "ash/display/window_tree_host_manager.h" #include "ash/shell.h" #include "ash/sticky_keys/sticky_keys_controller.h" #include "ash/test/ash_test_base.h" @@ -55,16 +55,18 @@ TEST_F(StickyKeysOverlayTest, OverlayNotDestroyedAfterDisplayRemoved) { // The overlay should belong to the secondary root window. StickyKeysOverlay overlay; views::Widget* overlay_widget = overlay.GetWidgetForTesting(); - DisplayController* display_controller = - Shell::GetInstance()->display_controller(); - EXPECT_EQ(display_controller->GetRootWindowForDisplayId(secondary_display_id), - overlay_widget->GetNativeWindow()->GetRootWindow()); + WindowTreeHostManager* window_tree_host_manager = + Shell::GetInstance()->window_tree_host_manager(); + EXPECT_EQ( + window_tree_host_manager->GetRootWindowForDisplayId(secondary_display_id), + overlay_widget->GetNativeWindow()->GetRootWindow()); // Removing the second display should move the overlay to the primary root // window. UpdateDisplay("1280x1024"); - EXPECT_EQ(display_controller->GetRootWindowForDisplayId(primary_display_id), - overlay_widget->GetNativeWindow()->GetRootWindow()); + EXPECT_EQ( + window_tree_host_manager->GetRootWindowForDisplayId(primary_display_id), + overlay_widget->GetNativeWindow()->GetRootWindow()); overlay.SetModifierKeyState(ui::EF_SHIFT_DOWN, STICKY_KEY_STATE_ENABLED); EXPECT_EQ(STICKY_KEY_STATE_ENABLED, |