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

Unified Diff: chrome/browser/chromeos/audio/audio_handler.h

Issue 10421010: Revert 138278 - Fix the volume controlling behaviors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « no previous file | chrome/browser/chromeos/audio/audio_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/audio/audio_handler.h
===================================================================
--- chrome/browser/chromeos/audio/audio_handler.h (revision 138298)
+++ chrome/browser/chromeos/audio/audio_handler.h (working copy)
@@ -33,10 +33,6 @@
static void Initialize();
static void Shutdown();
- // Same as Initialize but using the specified audio mixer. It takes
- // ownership of |mixer|.
- static void InitializeForTesting(AudioMixer* mixer);
-
// GetInstance returns NULL if not initialized or if already shutdown.
static AudioHandler* GetInstance();
@@ -66,8 +62,7 @@
// and constructor/destructor private as recommended for Singletons.
friend struct DefaultSingletonTraits<AudioHandler>;
- // Takes ownership of |mixer|.
- explicit AudioHandler(AudioMixer* mixer);
+ AudioHandler();
virtual ~AudioHandler();
scoped_ptr<AudioMixer> mixer_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/audio/audio_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698