diff options
| author | oshima <oshima@chromium.org> | 2015-04-21 17:58:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-22 00:58:54 +0000 |
| commit | 7ce0394e9e538467c9d11c85cd35689cfa281280 (patch) | |
| tree | b4246b26110b45c416c57020219132c540f302ab /ash/test | |
| parent | 46cf2a915a4a6fbcc3a55e651760dad89901a113 (diff) | |
| download | chromium_src-7ce0394e9e538467c9d11c85cd35689cfa281280.zip chromium_src-7ce0394e9e538467c9d11c85cd35689cfa281280.tar.gz chromium_src-7ce0394e9e538467c9d11c85cd35689cfa281280.tar.bz2 | |
DisplayManager Cleanup 2
better naming
simplified condition etc.
BUG=None
Review URL: https://codereview.chromium.org/1094413002
Cr-Commit-Position: refs/heads/master@{#326201}
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/ash_test_base.cc | 3 | ||||
| -rw-r--r-- | ash/test/display_manager_test_api.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index ef7fba3..6e6f78d 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -214,8 +214,7 @@ void AshTestBase::UpdateDisplay(const std::string& display_specs) { DisplayManager* display_manager = Shell::GetInstance()->display_manager(); DisplayManagerTestApi display_manager_test_api(display_manager); display_manager_test_api.UpdateDisplay(display_specs); - if (display_manager->HasSoftwareMirroringDisplay()) - RunAllPendingInMessageLoop(); + display_manager->RunPendingTasksForTest(); } aura::Window* AshTestBase::CurrentContext() { diff --git a/ash/test/display_manager_test_api.cc b/ash/test/display_manager_test_api.cc index 9bed696..87326ee 100644 --- a/ash/test/display_manager_test_api.cc +++ b/ash/test/display_manager_test_api.cc @@ -82,7 +82,7 @@ void DisplayManagerTestApi::UpdateDisplay( } int64 DisplayManagerTestApi::SetFirstDisplayAsInternalDisplay() { - const gfx::Display& internal = display_manager_->displays_[0]; + const gfx::Display& internal = display_manager_->active_display_list_[0]; SetInternalDisplayId(internal.id()); return gfx::Display::InternalDisplayId(); } |