summaryrefslogtreecommitdiffstats
path: root/ash/extended_desktop_unittest.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-16 04:21:54 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-16 04:21:54 +0000
commit4c090d2e47966acc72365fad22612f2235d89396 (patch)
treedb06cf81ec14cc08c72e89a3ee0d10ca0f61f595 /ash/extended_desktop_unittest.cc
parent5f4616d145d23a69da79c7ce6ae7df4ae3da5d48 (diff)
downloadchromium_src-4c090d2e47966acc72365fad22612f2235d89396.zip
chromium_src-4c090d2e47966acc72365fad22612f2235d89396.tar.gz
chromium_src-4c090d2e47966acc72365fad22612f2235d89396.tar.bz2
Remove some methods from RootWindow that really belong on the WTH.
TBR=sky@chromium.org BUG= Review URL: https://codereview.chromium.org/167563004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/extended_desktop_unittest.cc')
-rw-r--r--ash/extended_desktop_unittest.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 6e02726..4d41fce 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -254,11 +254,13 @@ TEST_F(ExtendedDesktopTest, TestCursor) {
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
aura::WindowEventDispatcher* dispatcher0 = root_windows[0]->GetDispatcher();
aura::WindowEventDispatcher* dispatcher1 = root_windows[1]->GetDispatcher();
- EXPECT_EQ(ui::kCursorPointer, dispatcher0->last_cursor().native_type());
- EXPECT_EQ(ui::kCursorPointer, dispatcher1->last_cursor().native_type());
+ EXPECT_EQ(ui::kCursorPointer,
+ dispatcher0->host()->last_cursor().native_type());
+ EXPECT_EQ(ui::kCursorPointer,
+ dispatcher1->host()->last_cursor().native_type());
Shell::GetInstance()->cursor_manager()->SetCursor(ui::kCursorCopy);
- EXPECT_EQ(ui::kCursorCopy, dispatcher0->last_cursor().native_type());
- EXPECT_EQ(ui::kCursorCopy, dispatcher1->last_cursor().native_type());
+ EXPECT_EQ(ui::kCursorCopy, dispatcher0->host()->last_cursor().native_type());
+ EXPECT_EQ(ui::kCursorCopy, dispatcher1->host()->last_cursor().native_type());
}
TEST_F(ExtendedDesktopTest, TestCursorLocation) {