| Index: content/browser/renderer_host/media/media_stream_manager.h
|
| diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
|
| index 1eba375d27f7881ebffc5fb1f32415eae844c791..5d6c6ffe1b086f82fc9d48e09f250b4e94e4208e 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.h
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.h
|
| @@ -363,6 +363,12 @@ class CONTENT_EXPORT MediaStreamManager
|
| StreamDeviceInfoArray devices,
|
| gfx::NativeViewId window_id);
|
|
|
| +#if defined(OS_CHROMEOS)
|
| + // Checks if the system has a keyboard mic, and if so, inform the audio
|
| + // manager.
|
| + void CheckKeyboardMicOnUIThread();
|
| +#endif
|
| +
|
| // Task runner shared by VideoCaptureManager and AudioInputDeviceManager and
|
| // used for enumerating audio output devices.
|
| // Note: Enumeration tasks may take seconds to complete so must never be run
|
| @@ -376,6 +382,14 @@ class CONTENT_EXPORT MediaStreamManager
|
| // Indicator of device monitoring state.
|
| bool monitoring_started_;
|
|
|
| +#if defined(OS_CHROMEOS)
|
| + // Flag that's set when we have checked if the system has a keyboard mic. We
|
| + // only need to check it once, and not when constructing since that will
|
| + // affect startup time.
|
| + // Must be accessed on the IO thread;
|
| + bool has_checked_keyboard_mic_;
|
| +#endif
|
| +
|
| // Stores most recently enumerated device lists. The cache is cleared when
|
| // monitoring is stopped or there is no request for that type of device.
|
| EnumerationCache audio_enumeration_cache_;
|
|
|