diff options
| author | oshima <oshima@chromium.org> | 2015-05-22 00:07:04 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-22 07:07:34 +0000 |
| commit | b83c400b39840d0c18bd113559ea0040eb3c6b46 (patch) | |
| tree | d06cc362bc1550dc1a9c9c6baa704c2dd3d71d72 /ash/screen_util_unittest.cc | |
| parent | 804c84c4636bf39bfffcd44e459c569544e5e5d6 (diff) | |
| download | chromium_src-b83c400b39840d0c18bd113559ea0040eb3c6b46.zip chromium_src-b83c400b39840d0c18bd113559ea0040eb3c6b46.tar.gz chromium_src-b83c400b39840d0c18bd113559ea0040eb3c6b46.tar.bz2 | |
Save and restore unified mode
BUG=489809
TEST=DisplayPreferenceTest.SaveUnifiedMode/RestoreUnifiedMode
Review URL: https://codereview.chromium.org/1150913002
Cr-Commit-Position: refs/heads/master@{#331076}
Diffstat (limited to 'ash/screen_util_unittest.cc')
| -rw-r--r-- | ash/screen_util_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/screen_util_unittest.cc b/ash/screen_util_unittest.cc index 6e74390..7fc9ae6 100644 --- a/ash/screen_util_unittest.cc +++ b/ash/screen_util_unittest.cc @@ -10,6 +10,7 @@ #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" +#include "ash/test/display_manager_test_api.h" #include "ash/wm/window_util.h" #include "ui/aura/env.h" #include "ui/aura/window.h" @@ -116,6 +117,8 @@ TEST_F(ScreenUtilTest, ConvertRect) { TEST_F(ScreenUtilTest, ShelfDisplayBoundsInUnifiedDesktop) { if (!SupportsMultipleDisplays()) return; + test::DisplayManagerTestApi::EnableUnifiedDesktopForTest(); + DisplayManager* display_manager = Shell::GetInstance()->display_manager(); display_manager->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED); display_manager->SetMultiDisplayMode(DisplayManager::UNIFIED); |