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

Side by Side Diff: content/browser/renderer_host/media/media_stream_manager.h

Issue 596233003: Move ensure keyboard mic check in MediaStreamManager to SetupRequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@kmic_test
Patch Set: Use the proper base file. Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // MediaStreamManager is used to open/enumerate media capture devices (video 5 // MediaStreamManager is used to open/enumerate media capture devices (video
6 // supported now). Call flow: 6 // supported now). Call flow:
7 // 1. GenerateStream is called when a render process wants to use a capture 7 // 1. GenerateStream is called when a render process wants to use a capture
8 // device. 8 // device.
9 // 2. MediaStreamManager will ask MediaStreamUIController for permission to 9 // 2. MediaStreamManager will ask MediaStreamUIController for permission to
10 // use devices and for which device to use. 10 // use devices and for which device to use.
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 void AddLogMessageOnUIThread(const std::set<int>& render_process_ids, 357 void AddLogMessageOnUIThread(const std::set<int>& render_process_ids,
358 const std::string& message); 358 const std::string& message);
359 359
360 // Handles the callback from MediaStreamUIProxy to receive the UI window id, 360 // Handles the callback from MediaStreamUIProxy to receive the UI window id,
361 // used for excluding the notification window in desktop capturing. 361 // used for excluding the notification window in desktop capturing.
362 void OnMediaStreamUIWindowId(MediaStreamType video_type, 362 void OnMediaStreamUIWindowId(MediaStreamType video_type,
363 StreamDeviceInfoArray devices, 363 StreamDeviceInfoArray devices,
364 gfx::NativeViewId window_id); 364 gfx::NativeViewId window_id);
365 365
366 #if defined(OS_CHROMEOS) 366 #if defined(OS_CHROMEOS)
367 // Ensures that we have checked for presence of a keyboard mic. This is only
368 // done once. This function should be called before posting a request on the
369 // UI thread.
370 void EnsureKeyboardMicChecked();
371
367 // Checks if the system has a keyboard mic, and if so, inform the audio 372 // Checks if the system has a keyboard mic, and if so, inform the audio
368 // manager via SetKeyboardMicOnDeviceThread(). 373 // manager via SetKeyboardMicOnDeviceThread().
369 void CheckKeyboardMicOnUIThread(); 374 void CheckKeyboardMicOnUIThread();
370 375
371 // Tells the audio mananger that the system supports a keyboard mic. 376 // Tells the audio mananger that the system supports a keyboard mic.
372 void SetKeyboardMicOnDeviceThread(); 377 void SetKeyboardMicOnDeviceThread();
373 #endif 378 #endif
374 379
375 // Task runner shared by VideoCaptureManager and AudioInputDeviceManager and 380 // Task runner shared by VideoCaptureManager and AudioInputDeviceManager and
376 // used for enumerating audio output devices. 381 // used for enumerating audio output devices.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 416
412 bool use_fake_ui_; 417 bool use_fake_ui_;
413 scoped_ptr<FakeMediaStreamUIProxy> fake_ui_; 418 scoped_ptr<FakeMediaStreamUIProxy> fake_ui_;
414 419
415 DISALLOW_COPY_AND_ASSIGN(MediaStreamManager); 420 DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
416 }; 421 };
417 422
418 } // namespace content 423 } // namespace content
419 424
420 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_ 425 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698