summaryrefslogtreecommitdiffstats
path: root/ui/aura/root_window_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 /ui/aura/root_window_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 'ui/aura/root_window_unittest.cc')
-rw-r--r--ui/aura/root_window_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index 7971d93..168344f 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -844,7 +844,7 @@ TEST_F(RootWindowTest, DispatchMouseExitWhenCursorHidden) {
filter->Reset();
// Hide the cursor and verify a mouse exit was dispatched.
- dispatcher()->OnCursorVisibilityChanged(false);
+ dispatcher()->host()->OnCursorVisibilityChanged(false);
EXPECT_FALSE(filter->events().empty());
EXPECT_EQ("MOUSE_EXITED", EventTypesToString(filter->events()));
@@ -1305,7 +1305,7 @@ TEST_F(RootWindowTest, MAYBE_ValidRootDuringDestruction) {
{
scoped_ptr<RootWindow> root_window(
new RootWindow(RootWindow::CreateParams(gfx::Rect(0, 0, 100, 100))));
- root_window->Init();
+ root_window->host()->InitHost();
// Owned by RootWindow.
Window* w1 = CreateNormalWindow(1, root_window->window(), NULL);
w1->AddObserver(&observer);
@@ -1420,7 +1420,7 @@ TEST_F(RootWindowTest, MAYBE_DeleteRootFromHeldMouseEvent) {
// Should be deleted by |delegate|.
RootWindow* r2 =
new RootWindow(RootWindow::CreateParams(gfx::Rect(0, 0, 100, 100)));
- r2->Init();
+ r2->host()->InitHost();
DeleteRootFromHeldMouseEventDelegate delegate(r2);
// Owned by |r2|.
Window* w1 = CreateNormalWindow(1, r2->window(), &delegate);