ash/test/test_suite.cc - Issue 178883004: Enable the volume slider in Ash for windows.

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: ash/test/test_suite.cc

Issue 178883004: Enable the volume slider in Ash for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix COM initialization errors (the right way). Created 6 years, 9 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:

Index: ash/test/test_suite.cc

diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc

index 00a73c7e0bf625b07eff676869fee251e744cac1..11e1285a45df41646873b68010b9b6b9c2228d39 100644

--- a/ash/test/test_suite.cc

+++ b/ash/test/test_suite.cc

@@ -33,12 +33,14 @@ void AuraShellTestSuite::Initialize() {

gfx::GLSurface::InitializeOneOffForTests(true);

#if defined(OS_WIN)

- if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&

+ base::win::Version version = base::win::GetVersion();

+ if (version >= base::win::VERSION_WIN7 &&

!CommandLine::ForCurrentProcess()->HasSwitch(

ash::switches::kForceAshToDesktop)) {

com_initializer_.reset(new base::win::ScopedCOMInitializer());

ui::win::CreateATLModuleIfNeeded();

- ASSERT_TRUE(win8::MakeTestDefaultBrowserSynchronously());

+ if (version >= base::win::VERSION_WIN8)

+ ASSERT_TRUE(win8::MakeTestDefaultBrowserSynchronously());

}

#endif

« no previous file with comments | « ash/test/ash_test_helper_unittest.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »