chrome/test/ui/ui_test.cc - Issue 12093083: Temporarily makes use_aura the default on windows so we can get perf

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/ui/ui_test.cc

Issue 12093083: Temporarily makes use_aura the default on windows so we can get perf (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Merge to trunk and remove frame_rate_tests change (landed separately) Created 7 years, 11 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

Index: chrome/test/ui/ui_test.cc

diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc

index 938f9c8e984cbebce2f7ccd3cf13a0b3c0a7e5ef..4a42ecbc161331f512075fc88d4b67422f054788 100644

--- a/chrome/test/ui/ui_test.cc

+++ b/chrome/test/ui/ui_test.cc

@@ -205,7 +205,8 @@ void UITestBase::SetLaunchSwitches() {

}

if (!test_name_.empty())

launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_);

-#if defined(USE_AURA)

+ // TODO: !OS_WIN is temporary, will remove shortly.

+#if defined(USE_AURA) && !defined(OS_WIN)

if (!CommandLine::ForCurrentProcess()->HasSwitch(

switches::kDisableTestCompositor)) {

launch_arguments_.AppendSwitch(switches::kTestCompositor);

« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »