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

Unified Diff: media/audio/audio_manager_base.h

Issue 13288002: Revert 190475 "Merge 189983 "Add speaker on/off control on Andro..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_input_unittest.cc ('k') | media/audio/audio_manager_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_base.h
===================================================================
--- media/audio/audio_manager_base.h (revision 191282)
+++ media/audio/audio_manager_base.h (working copy)
@@ -146,11 +146,7 @@
// Called by Shutdown().
void ShutdownOnAudioThread();
-#if defined(OS_ANDROID)
void SetAudioMode(int mode);
- void RegisterHeadsetReceiver();
- void UnregisterHeadsetReceiver();
-#endif
// Counts the number of active input streams to find out if something else
// is currently recording in Chrome.
@@ -186,11 +182,6 @@
// data to this virtual input stream.
VirtualAudioInputStream* virtual_audio_input_stream_;
-#if defined(OS_ANDROID)
- // Java AudioManager instance.
- base::android::ScopedJavaGlobalRef<jobject> j_audio_manager_;
-#endif
-
DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
};
« no previous file with comments | « media/audio/audio_input_unittest.cc ('k') | media/audio/audio_manager_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698