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

Unified Diff: ash/display/mirror_window_controller_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_unittest.cc ('k') | ash/display/screen_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/mirror_window_controller_unittest.cc
diff --git a/ash/display/mirror_window_controller_unittest.cc b/ash/display/mirror_window_controller_unittest.cc
index d00d0ec3214afc1c76ba881df7192eae2c43853d..6b2a9b38b654262710bf7a200ffc6720a6799eab 100644
--- a/ash/display/mirror_window_controller_unittest.cc
+++ b/ash/display/mirror_window_controller_unittest.cc
@@ -4,7 +4,6 @@
#include "ash/display/mirror_window_controller.h"
-#include "ash/common/ash_switches.h"
#include "ash/display/display_manager.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/screen_util.h"
@@ -21,6 +20,7 @@
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/hit_test.h"
+#include "ui/display/display_switches.h"
#include "ui/events/test/event_generator.h"
namespace ash {
@@ -41,9 +41,9 @@ class MirrorOnBootTest : public test::AshTestBase {
void SetUp() override {
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
- switches::kAshHostWindowBounds, "1+1-300x300,1+301-300x300");
+ ::switches::kHostWindowBounds, "1+1-300x300,1+301-300x300");
base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kAshEnableSoftwareMirroring);
+ ::switches::kEnableSoftwareMirroring);
test::AshTestBase::SetUp();
}
void TearDown() override { test::AshTestBase::TearDown(); }
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/display/screen_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698