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

Unified Diff: ash/system/overview/overview_button_tray_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/system/chromeos/rotation/tray_rotation_lock_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/overview/overview_button_tray_unittest.cc
diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc
index 262adf73056cae1a239e91186fafea163d163224..7cd0b1138f6fabe1332617f7c19096835e98c562 100644
--- a/ash/system/overview/overview_button_tray_unittest.cc
+++ b/ash/system/overview/overview_button_tray_unittest.cc
@@ -4,7 +4,6 @@
#include "ash/common/system/overview/overview_button_tray.h"
-#include "ash/common/ash_switches.h"
#include "ash/common/login_status.h"
#include "ash/common/shelf/shelf_types.h"
#include "ash/common/system/status_area_widget.h"
@@ -25,6 +24,7 @@
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
+#include "ui/display/display_switches.h"
#include "ui/events/event.h"
#include "ui/events/event_constants.h"
#include "ui/events/gestures/gesture_types.h"
@@ -69,7 +69,7 @@ class OverviewButtonTrayTest : public test::AshTestBase {
void OverviewButtonTrayTest::SetUp() {
base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kAshUseFirstDisplayAsInternal);
+ ::switches::kUseFirstDisplayAsInternal);
AshTestBase::SetUp();
}
« no previous file with comments | « ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698