diff options
| author | oshima <oshima@chromium.org> | 2014-12-19 14:35:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-19 22:36:04 +0000 |
| commit | a668744c99b71bae9341a2bef578dbc691408bb1 (patch) | |
| tree | 1bc316ddc9554d20d5320946371b854282ce534e /ash/display/display_manager_unittest.cc | |
| parent | 2828c05d7fccee9fd62924be47c94cd4f7a64a2d (diff) | |
| download | chromium_src-a668744c99b71bae9341a2bef578dbc691408bb1.zip chromium_src-a668744c99b71bae9341a2bef578dbc691408bb1.tar.gz chromium_src-a668744c99b71bae9341a2bef578dbc691408bb1.tar.bz2 | |
[Cleanup] DisplayManager cleanup
* Move methods that doesn't depend on display manager to separate util file.
* Remove less useful method.
BUG=401044
TEST=no functional change. all tests should still pass.
Review URL: https://codereview.chromium.org/806243002
Cr-Commit-Position: refs/heads/master@{#309283}
Diffstat (limited to 'ash/display/display_manager_unittest.cc')
| -rw-r--r-- | ash/display/display_manager_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index f9c5c3c..3741a7b 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc @@ -8,6 +8,7 @@ #include "ash/display/display_controller.h" #include "ash/display/display_info.h" #include "ash/display/display_layout_store.h" +#include "ash/display/display_util.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" @@ -1089,8 +1090,7 @@ TEST_F(DisplayManagerTest, UIScaleWithDisplayMode) { CreateDisplayInfo(display_id, gfx::Rect(0, 0, 1280, 800)); std::vector<DisplayMode> display_modes; const DisplayMode base_mode(gfx::Size(1280, 800), 60.0f, false, false); - std::vector<DisplayMode> mode_list = - DisplayManager::CreateInternalDisplayModeList(base_mode); + std::vector<DisplayMode> mode_list = CreateInternalDisplayModeList(base_mode); native_display_info.SetDisplayModes(mode_list); std::vector<DisplayInfo> display_info_list; |