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

Side by Side Diff: chrome/browser/media/media_capture_devices_dispatcher.cc

Issue 22256002: Remove tabCapture about:flags switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
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 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 5 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/sha1.h" 10 #include "base/sha1.h"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h" 14 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
15 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry_factory .h" 15 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry_factory .h"
16 #include "chrome/browser/media/audio_stream_indicator.h" 16 #include "chrome/browser/media/audio_stream_indicator.h"
17 #include "chrome/browser/media/media_stream_capture_indicator.h" 17 #include "chrome/browser/media/media_stream_capture_indicator.h"
18 #include "chrome/browser/media/media_stream_infobar_delegate.h" 18 #include "chrome/browser/media/media_stream_infobar_delegate.h"
19 #include "chrome/browser/prefs/scoped_user_pref_update.h" 19 #include "chrome/browser/prefs/scoped_user_pref_update.h"
20 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/ui/simple_message_box.h" 21 #include "chrome/browser/ui/simple_message_box.h"
22 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
23 #include "chrome/common/extensions/extension.h" 23 #include "chrome/common/extensions/extension.h"
24 #include "chrome/common/extensions/feature_switch.h"
25 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
26 #include "components/user_prefs/pref_registry_syncable.h" 25 #include "components/user_prefs/pref_registry_syncable.h"
27 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
28 #include "content/public/browser/media_devices_monitor.h" 27 #include "content/public/browser/media_devices_monitor.h"
29 #include "content/public/browser/notification_service.h" 28 #include "content/public/browser/notification_service.h"
30 #include "content/public/browser/notification_source.h" 29 #include "content/public/browser/notification_source.h"
31 #include "content/public/browser/notification_types.h" 30 #include "content/public/browser/notification_types.h"
32 #include "content/public/browser/web_contents.h" 31 #include "content/public/browser/web_contents.h"
33 #include "content/public/common/media_stream_request.h" 32 #include "content/public/common/media_stream_request.h"
34 #include "extensions/common/constants.h" 33 #include "extensions/common/constants.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 #else 269 #else
271 extensions::TabCaptureRegistry* tab_capture_registry = 270 extensions::TabCaptureRegistry* tab_capture_registry =
272 extensions::TabCaptureRegistryFactory::GetForProfile(profile); 271 extensions::TabCaptureRegistryFactory::GetForProfile(profile);
273 bool tab_capture_allowed = 272 bool tab_capture_allowed =
274 tab_capture_registry->VerifyRequest(request.render_process_id, 273 tab_capture_registry->VerifyRequest(request.render_process_id,
275 request.render_view_id); 274 request.render_view_id);
276 #endif 275 #endif
277 276
278 if (request.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE && 277 if (request.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE &&
279 tab_capture_allowed && 278 tab_capture_allowed &&
280 extensions::FeatureSwitch::tab_capture()->IsEnabled() &&
281 extension->HasAPIPermission(extensions::APIPermission::kTabCapture)) { 279 extension->HasAPIPermission(extensions::APIPermission::kTabCapture)) {
282 devices.push_back(content::MediaStreamDevice( 280 devices.push_back(content::MediaStreamDevice(
283 content::MEDIA_TAB_AUDIO_CAPTURE, std::string(), std::string())); 281 content::MEDIA_TAB_AUDIO_CAPTURE, std::string(), std::string()));
284 } else if (request.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE && 282 } else if (request.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE &&
285 extension->HasAPIPermission( 283 extension->HasAPIPermission(
286 extensions::APIPermission::kAudioCapture)) { 284 extensions::APIPermission::kAudioCapture)) {
287 GetDefaultDevicesForProfile(profile, true, false, &devices); 285 GetDefaultDevicesForProfile(profile, true, false, &devices);
288 } 286 }
289 287
290 if (request.video_type == content::MEDIA_TAB_VIDEO_CAPTURE && 288 if (request.video_type == content::MEDIA_TAB_VIDEO_CAPTURE &&
291 tab_capture_allowed && 289 tab_capture_allowed &&
292 extensions::FeatureSwitch::tab_capture()->IsEnabled() &&
293 extension->HasAPIPermission(extensions::APIPermission::kTabCapture)) { 290 extension->HasAPIPermission(extensions::APIPermission::kTabCapture)) {
294 devices.push_back(content::MediaStreamDevice( 291 devices.push_back(content::MediaStreamDevice(
295 content::MEDIA_TAB_VIDEO_CAPTURE, std::string(), std::string())); 292 content::MEDIA_TAB_VIDEO_CAPTURE, std::string(), std::string()));
296 } else if (request.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE && 293 } else if (request.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE &&
297 extension->HasAPIPermission(extensions::APIPermission::kVideoCapture)) { 294 extension->HasAPIPermission(extensions::APIPermission::kVideoCapture)) {
298 GetDefaultDevicesForProfile(profile, false, true, &devices); 295 GetDefaultDevicesForProfile(profile, false, true, &devices);
299 } 296 }
300 297
301 scoped_ptr<content::MediaStreamUI> ui; 298 scoped_ptr<content::MediaStreamUI> ui;
302 if (!devices.empty()) { 299 if (!devices.empty()) {
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 state)); 558 state));
562 } 559 }
563 560
564 void MediaCaptureDevicesDispatcher::OnCreatingAudioStreamOnUIThread( 561 void MediaCaptureDevicesDispatcher::OnCreatingAudioStreamOnUIThread(
565 int render_process_id, 562 int render_process_id,
566 int render_view_id) { 563 int render_view_id) {
567 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 564 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
568 FOR_EACH_OBSERVER(Observer, observers_, 565 FOR_EACH_OBSERVER(Observer, observers_,
569 OnCreatingAudioStream(render_process_id, render_view_id)); 566 OnCreatingAudioStream(render_process_id, render_view_id));
570 } 567 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc ('k') | chrome/common/chrome_switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698