diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 18:24:33 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 18:24:33 +0000 |
| commit | 55ad8c14c31df30801d8422e81b78322f95c0526 (patch) | |
| tree | c0fe47685194fd2137c658944589c439d93b0c8b /ash/wm/window_util_unittest.cc | |
| parent | f3eccd0dfd02eb6b32c1a233e28439fc1a241d65 (diff) | |
| download | chromium_src-55ad8c14c31df30801d8422e81b78322f95c0526.zip chromium_src-55ad8c14c31df30801d8422e81b78322f95c0526.tar.gz chromium_src-55ad8c14c31df30801d8422e81b78322f95c0526.tar.bz2 | |
Screen cleanup:
* Split ScreenAsh to ScreenUtil (set of utility functions) and the screen implementation.
* moved screen_ash from Shell to DisplayManager. Ash specific imp is now hidden in DisplayManager.
* Shell now creates a separate screen object which simply keeps the list of displays for shutdown. This allow all screen operation valid during shutdown.
BUG=None
TBR=hongbo.min@intel.com,sky@chromium.org
Review URL: https://codereview.chromium.org/138003007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_util_unittest.cc')
| -rw-r--r-- | ash/wm/window_util_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/window_util_unittest.cc b/ash/wm/window_util_unittest.cc index 66618df..5445793 100644 --- a/ash/wm/window_util_unittest.cc +++ b/ash/wm/window_util_unittest.cc @@ -4,7 +4,7 @@ #include "ash/wm/window_util.h" -#include "ash/screen_ash.h" +#include "ash/screen_util.h" #include "ash/test/ash_test_base.h" #include "ui/aura/window.h" @@ -33,7 +33,7 @@ TEST_F(WindowUtilTest, CenterWindow) { EXPECT_EQ("200,126 100x100", window->bounds().ToString()); EXPECT_EQ("200,126 100x100", window->GetBoundsInScreen().ToString()); window->SetBoundsInScreen(gfx::Rect(600, 0, 100, 100), - ScreenAsh::GetSecondaryDisplay()); + ScreenUtil::GetSecondaryDisplay()); wm::CenterWindow(window.get()); EXPECT_EQ("250,126 100x100", window->bounds().ToString()); EXPECT_EQ("750,126 100x100", window->GetBoundsInScreen().ToString()); |