diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 19:22:45 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 19:22:45 +0000 |
| commit | bf9cdb36cc79becab099c9f37eb80284fb203f45 (patch) | |
| tree | 4c9011f0aa08ac613027abd372cec3a3b613032b /ash/shell_unittest.cc | |
| parent | fef72c1c9890633a237e06ccb0d0f4ce2ca6c9c1 (diff) | |
| download | chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.zip chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.tar.gz chromium_src-bf9cdb36cc79becab099c9f37eb80284fb203f45.tar.bz2 | |
Make GetRootWindow() return a Window instead of a RootWindow.
Also adds a typedef from RootWindow to WindowEventDispatcher, the eventual name of this type.
Adds a GetDispatcher() method that crawls up to the root Window and returns the WindowEventDispatcher.
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/37733003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 994f456..309ebae 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -54,7 +54,7 @@ aura::Window* GetAlwaysOnTopContainer() { // Expect ALL the containers! void ExpectAllContainers() { - aura::RootWindow* root_window = Shell::GetPrimaryRootWindow(); + aura::Window* root_window = Shell::GetPrimaryRootWindow(); EXPECT_TRUE(Shell::GetContainer( root_window, internal::kShellWindowId_DesktopBackgroundContainer)); EXPECT_TRUE(Shell::GetContainer( @@ -397,8 +397,9 @@ TEST_F(ShellTest, ManagedWindowModeBasics) { EXPECT_TRUE(launcher_widget->IsVisible()); // Launcher is at bottom-left of screen. EXPECT_EQ(0, launcher_widget->GetWindowBoundsInScreen().x()); - EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetHostSize().height(), - launcher_widget->GetWindowBoundsInScreen().bottom()); + EXPECT_EQ( + Shell::GetPrimaryRootWindow()->GetDispatcher()->GetHostSize().height(), + launcher_widget->GetWindowBoundsInScreen().bottom()); // We have a desktop background but not a bare layer. // TODO (antrim): enable once we find out why it fails component build. // internal::DesktopBackgroundWidgetController* background = @@ -482,7 +483,7 @@ TEST_F(ShellTest, ToggleAutoHide) { wm::ActivateWindow(window.get()); Shell* shell = Shell::GetInstance(); - aura::RootWindow* root_window = Shell::GetPrimaryRootWindow(); + aura::Window* root_window = Shell::GetPrimaryRootWindow(); shell->SetShelfAutoHideBehavior(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, root_window); EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, |