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

Unified Diff: ash/display/display_manager_unittest.cc

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 years, 3 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/display/display_manager.cc ('k') | ash/display/mirror_window_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager_unittest.cc
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index 393fe0ce2722585aa1ccca35160d16416c43e2a9..534669838606d58e4784ce8706f98c1c2970b8f1 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -5,7 +5,6 @@
#include "ash/display/display_manager.h"
#include "ash/accelerators/accelerator_commands_aura.h"
-#include "ash/common/ash_switches.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/wm/window_state.h"
#include "ash/display/display_configuration_controller.h"
@@ -31,6 +30,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/display/display.h"
#include "ui/display/display_observer.h"
+#include "ui/display/display_switches.h"
#include "ui/display/manager/display_layout_builder.h"
#include "ui/display/manager/display_layout_store.h"
#include "ui/display/manager/display_manager_utilities.h"
@@ -2203,8 +2203,8 @@ class FontTestHelper : public test::AshTestBase {
gfx::ClearFontRenderParamsCacheForTest();
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (display_type == INTERNAL)
- command_line->AppendSwitch(switches::kAshUseFirstDisplayAsInternal);
- command_line->AppendSwitchASCII(switches::kAshHostWindowBounds,
+ command_line->AppendSwitch(::switches::kUseFirstDisplayAsInternal);
+ command_line->AppendSwitchASCII(::switches::kHostWindowBounds,
StringPrintf("1000x800*%f", scale));
SetUp();
}
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/display/mirror_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698