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

Unified Diff: ash/test/ash_test_base.cc

Issue 23620060: Try to enable software mirror mode in UI message loop after Init() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 7 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/window_watcher_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 65994e962877225fe6aac5c6047177e0fb81abff..f83c41e4c8930dc0eeff8379611941bbb4af2d5e 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -103,8 +103,11 @@ void AshTestBase::SetUp() {
// TODO(jamescook): Can we do this without changing command line?
// Use the origin (1,1) so that it doesn't over
// lap with the native mouse cursor.
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(
- switches::kAshHostWindowBounds, "1+1-800x600");
+ CommandLine* command_line = CommandLine::ForCurrentProcess();
+ if (!command_line->HasSwitch(switches::kAshHostWindowBounds)) {
+ command_line->AppendSwitchASCII(
+ switches::kAshHostWindowBounds, "1+1-800x600");
+ }
#if defined(OS_WIN)
aura::test::SetUsePopupAsRootWindowForTest(true);
#endif
@@ -119,8 +122,7 @@ void AshTestBase::SetUp() {
#if defined(OS_WIN)
if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
- !CommandLine::ForCurrentProcess()->HasSwitch(
- ash::switches::kForceAshToDesktop)) {
+ !command_line->HasSwitch(ash::switches::kForceAshToDesktop)) {
ipc_thread_.reset(new base::Thread("test_metro_viewer_ipc_thread"));
base::Thread::Options options;
options.message_loop_type = base::MessageLoop::TYPE_IO;
« no previous file with comments | « ash/shell/window_watcher_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698