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

Unified Diff: ash/system/chromeos/rotation/tray_rotation_lock_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/shell_unittest.cc ('k') | ash/system/overview/overview_button_tray_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
diff --git a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
index 8bf0203ecbf880a858f23f091d31f550d306b800..287217916afca1448bd58f747c685e9d2a28933a 100644
--- a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
+++ b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
@@ -6,7 +6,6 @@
#include <memory>
-#include "ash/common/ash_switches.h"
#include "ash/common/system/status_area_widget.h"
#include "ash/common/system/tray/system_tray.h"
#include "ash/common/system/tray/system_tray_delegate.h"
@@ -20,6 +19,7 @@
#include "ash/test/status_area_widget_test_helper.h"
#include "base/command_line.h"
#include "base/time/time.h"
+#include "ui/display/display_switches.h"
#include "ui/events/event.h"
#include "ui/events/event_constants.h"
#include "ui/views/view.h"
@@ -98,7 +98,7 @@ void TrayRotationLockTest::SetUp() {
// allows for DisplayManager to treat it as one. TrayRotationLock is only
// visible on internal primary displays.
base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kAshUseFirstDisplayAsInternal);
+ ::switches::kUseFirstDisplayAsInternal);
test::AshTestBase::SetUp();
SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
}
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/system/overview/overview_button_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698