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

Unified Diff: media/audio/audio_manager_base.h

Issue 12571006: Add MODIFY_AUDIO_SETTINGS permission in Android manifest and implementation in audio manager. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: disable more unit tests 2 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 187380)
+++ media/audio/audio_manager_base.h (working copy)
@@ -20,6 +20,10 @@
#include "base/win/scoped_com_initializer.h"
#endif
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#endif
+
namespace base {
class Thread;
}
@@ -93,6 +97,10 @@
virtual AudioParameters GetInputStreamParameters(
const std::string& device_id) OVERRIDE;
+#if defined(OS_ANDROID)
+ static bool RegisterAudioManager(JNIEnv* env);
+#endif
+
protected:
AudioManagerBase();
@@ -132,6 +140,8 @@
// Called by Shutdown().
void ShutdownOnAudioThread();
+ void SetAudioMode(int mode);
+
// Counts the number of active input streams to find out if something else
// is currently recording in Chrome.
base::AtomicRefCount num_active_input_streams_;
« 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