Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1938)

Unified Diff: ash/test/ash_test_base.cc

Issue 2840043003: chromeos: Makes mushrome use simplified display management (Closed)
Patch Set: merge Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell_init_params.h ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index f49a5ac9cad82f6db243221b3aee7e4d6cfc32e5..5e62df8ab677ee399a5bb03f579e72c64e93f9b3 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -225,7 +225,7 @@ display::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() {
// static
void AshTestBase::UpdateDisplay(const std::string& display_specs) {
- if (Shell::GetAshConfig() != Config::CLASSIC) {
+ if (Shell::GetAshConfig() == Config::MASH) {
ash_test_helper_->UpdateDisplayForMash(display_specs);
} else {
display::test::DisplayManagerTestApi(Shell::Get()->display_manager())
« no previous file with comments | « ash/shell_init_params.h ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698