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

Unified Diff: chrome/test/base/view_event_test_platform_part_chromeos.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 | « chrome/test/base/in_process_browser_test.cc ('k') | ui/display/display_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/view_event_test_platform_part_chromeos.cc
diff --git a/chrome/test/base/view_event_test_platform_part_chromeos.cc b/chrome/test/base/view_event_test_platform_part_chromeos.cc
index 3222d190f10baa76e1de5747d3a2204d5b03b197..8682cbf9ebf4481857378eb9e8c5dba0c559787d 100644
--- a/chrome/test/base/view_event_test_platform_part_chromeos.cc
+++ b/chrome/test/base/view_event_test_platform_part_chromeos.cc
@@ -6,7 +6,6 @@
#include <memory>
-#include "ash/common/ash_switches.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/shell.h"
#include "ash/shell_init_params.h"
@@ -22,6 +21,7 @@
#include "device/bluetooth/dbus/bluez_dbus_manager.h"
#include "ui/aura/env.h"
#include "ui/aura/window_tree_host.h"
+#include "ui/display/display_switches.h"
#include "ui/message_center/message_center.h"
#include "ui/wm/core/wm_state.h"
@@ -68,7 +68,7 @@ ViewEventTestPlatformPartChromeOS::ViewEventTestPlatformPartChromeOS(
init_params.context_factory = context_factory;
init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
- ash::switches::kAshHostWindowBounds, "0+0-1280x800");
+ switches::kHostWindowBounds, "0+0-1280x800");
ash::Shell::CreateInstance(init_params);
ash::test::AshTestHelper::GetTestSessionStateDelegate()->
SetActiveUserSessionStarted(true);
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | ui/display/display_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698