summaryrefslogtreecommitdiffstats
path: root/media/audio
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 15:40:29 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 15:40:29 +0000
commit4ab9b0d0ac2a106dfde620c3e7c6144b72621798 (patch)
tree4d436ff426fe0689471f685e9055ea2cb393853f /media/audio
parenteed83cb0379785271ba02ac54b07d18f2ea3d71c (diff)
downloadchromium_src-4ab9b0d0ac2a106dfde620c3e7c6144b72621798.zip
chromium_src-4ab9b0d0ac2a106dfde620c3e7c6144b72621798.tar.gz
chromium_src-4ab9b0d0ac2a106dfde620c3e7c6144b72621798.tar.bz2
Revert of Resubmit enable the volume slider in Ash for windows. (https://codereview.chromium.org/193173002/)
Reason for revert: Broke ash_unittests on Vista: http://build.chromium.org/p/chromium.win/builders/Vista%20Tests%20%282%29/builds/41713/steps/ash_unittests/logs/AshTestHelper Original issue's description: > Resubmit enable the volume slider in Ash for windows. > > BUG=227247 > > This is a resubmit of https://codereview.chromium.org/178883004/ > > That patch caused tests to fail on Vista due to uninitialized COM errors. > I've uploaded this patch as a diff to that codereview as well (Patch Set 11), so you can diff Patch Set 11 against Patch Set 10 to see the fix. > > In words though, the fix is: > > 1) Don't special-case DesktopNotificationsTest for COM initialization, instead fix AuraShellTestSuite to correctly initialize COM for Win7+, not just Win8+ (since Ash is supported on Win7). > > 2) Make the same fix for Win7 in InProcessBrowserTest. > > 3) In AshTestSuiteTest, don't run the test on Vista and below since Ash isn't supported prior to Win7 (I don't know of a better way to disable this test at runtime based on OS version). > > TBR=henrika, jennyz > R=sky > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256374 TBR=sky@chromium.org,zturner@chromium.org NOTREECHECKS=true NOTRY=true BUG=227247 Review URL: https://codereview.chromium.org/197513003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
-rw-r--r--media/audio/win/core_audio_util_win.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/audio/win/core_audio_util_win.h b/media/audio/win/core_audio_util_win.h
index 8727f97..e78467e 100644
--- a/media/audio/win/core_audio_util_win.h
+++ b/media/audio/win/core_audio_util_win.h
@@ -4,7 +4,7 @@
// Utility methods for the Core Audio API on Windows.
// Always ensure that Core Audio is supported before using these methods.
-// Use media::CoreAudioUtil::IsSupported() for this purpose.
+// Use media::CoreAudioIsSupported() for this purpose.
// Also, all methods must be called on a valid COM thread. This can be done
// by using the base::win::ScopedCOMInitializer helper class.