OLD | NEW |
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_stream_devices_controller.h" | 5 #include "chrome/browser/media/media_stream_devices_controller.h" |
6 | 6 |
7 #include "base/metrics/histogram.h" | 7 #include "base/metrics/histogram.h" |
8 #include "base/prefs/scoped_user_pref_update.h" | 8 #include "base/prefs/scoped_user_pref_update.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
11 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 11 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
12 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 12 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
13 #include "chrome/browser/media/media_permission.h" | 13 #include "chrome/browser/media/media_permission.h" |
14 #include "chrome/browser/media/media_stream_capture_indicator.h" | 14 #include "chrome/browser/media/media_stream_capture_indicator.h" |
15 #include "chrome/browser/media/media_stream_device_permissions.h" | 15 #include "chrome/browser/media/media_stream_device_permissions.h" |
16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
20 #include "chrome/grit/generated_resources.h" | 20 #include "chrome/grit/generated_resources.h" |
21 #include "components/content_settings/core/browser/host_content_settings_map.h" | 21 #include "components/content_settings/core/browser/host_content_settings_map.h" |
22 #include "components/content_settings/core/common/content_settings_pattern.h" | 22 #include "components/content_settings/core/common/content_settings_pattern.h" |
23 #include "components/pref_registry/pref_registry_syncable.h" | 23 #include "components/pref_registry/pref_registry_syncable.h" |
24 #include "content/public/browser/browser_thread.h" | 24 #include "content/public/browser/browser_thread.h" |
25 #include "content/public/browser/render_widget_host_view.h" | 25 #include "content/public/browser/render_widget_host_view.h" |
26 #include "content/public/common/media_stream_request.h" | 26 #include "content/public/common/media_stream_request.h" |
| 27 #include "content/public/common/origin_util.h" |
| 28 #include "extensions/common/constants.h" |
27 #include "grit/theme_resources.h" | 29 #include "grit/theme_resources.h" |
28 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
29 | 31 |
30 #if defined(OS_ANDROID) | 32 #if defined(OS_ANDROID) |
31 #include "chrome/browser/android/preferences/pref_service_bridge.h" | 33 #include "chrome/browser/android/preferences/pref_service_bridge.h" |
32 #include "content/public/browser/android/content_view_core.h" | 34 #include "content/public/browser/android/content_view_core.h" |
33 #include "ui/android/window_android.h" | 35 #include "ui/android/window_android.h" |
34 #endif // OS_ANDROID | 36 #endif // OS_ANDROID |
35 | 37 |
36 using content::BrowserThread; | 38 using content::BrowserThread; |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 bool MediaStreamDevicesController::HasUserGesture() const { | 149 bool MediaStreamDevicesController::HasUserGesture() const { |
148 return request_.user_gesture; | 150 return request_.user_gesture; |
149 } | 151 } |
150 | 152 |
151 GURL MediaStreamDevicesController::GetRequestingHostname() const { | 153 GURL MediaStreamDevicesController::GetRequestingHostname() const { |
152 return request_.security_origin; | 154 return request_.security_origin; |
153 } | 155 } |
154 | 156 |
155 void MediaStreamDevicesController::PermissionGranted() { | 157 void MediaStreamDevicesController::PermissionGranted() { |
156 GURL origin(GetSecurityOriginSpec()); | 158 GURL origin(GetSecurityOriginSpec()); |
157 if (origin.SchemeIsSecure()) { | 159 if (content::IsOriginSecure(origin)) { |
158 UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions", | 160 UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions", |
159 kAllowHttps, kPermissionActionsMax); | 161 kAllowHttps, kPermissionActionsMax); |
160 } else { | 162 } else { |
161 UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions", | 163 UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions", |
162 kAllowHttp, kPermissionActionsMax); | 164 kAllowHttp, kPermissionActionsMax); |
163 } | 165 } |
164 RunCallback(GetNewSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, | 166 RunCallback(GetNewSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, |
165 old_audio_setting_, CONTENT_SETTING_ALLOW), | 167 old_audio_setting_, CONTENT_SETTING_ALLOW), |
166 GetNewSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, | 168 GetNewSetting(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, |
167 old_video_setting_, CONTENT_SETTING_ALLOW), | 169 old_video_setting_, CONTENT_SETTING_ALLOW), |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
327 } | 329 } |
328 content::MediaResponseCallback cb = callback_; | 330 content::MediaResponseCallback cb = callback_; |
329 callback_.Reset(); | 331 callback_.Reset(); |
330 cb.Run(devices, request_result, ui.Pass()); | 332 cb.Run(devices, request_result, ui.Pass()); |
331 } | 333 } |
332 | 334 |
333 void MediaStreamDevicesController::StorePermission( | 335 void MediaStreamDevicesController::StorePermission( |
334 ContentSetting new_audio_setting, | 336 ContentSetting new_audio_setting, |
335 ContentSetting new_video_setting) const { | 337 ContentSetting new_video_setting) const { |
336 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 338 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
337 | |
338 ContentSettingsPattern primary_pattern = | 339 ContentSettingsPattern primary_pattern = |
339 ContentSettingsPattern::FromURLNoWildcard(request_.security_origin); | 340 ContentSettingsPattern::FromURLNoWildcard(request_.security_origin); |
340 | 341 |
341 if (IsAskingForAudio() && new_audio_setting != CONTENT_SETTING_ASK) { | 342 if (IsAskingForAudio() && new_audio_setting != CONTENT_SETTING_ASK) { |
342 if (ShouldPersistContentSetting(new_audio_setting, request_.security_origin, | 343 if (ShouldPersistContentSetting(new_audio_setting, request_.security_origin, |
343 request_.request_type)) { | 344 request_.request_type)) { |
344 profile_->GetHostContentSettingsMap()->SetContentSetting( | 345 profile_->GetHostContentSettingsMap()->SetContentSetting( |
345 primary_pattern, ContentSettingsPattern::Wildcard(), | 346 primary_pattern, ContentSettingsPattern::Wildcard(), |
346 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), | 347 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), |
347 new_audio_setting); | 348 new_audio_setting); |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
472 if (android_permission_blocked) | 473 if (android_permission_blocked) |
473 return false; | 474 return false; |
474 | 475 |
475 // Don't approve device requests if the tab was hidden. | 476 // Don't approve device requests if the tab was hidden. |
476 // TODO(qinmin): Add a test for this. http://crbug.com/396869. | 477 // TODO(qinmin): Add a test for this. http://crbug.com/396869. |
477 // TODO(raymes): Shouldn't this apply to all permissions not just audio/video? | 478 // TODO(raymes): Shouldn't this apply to all permissions not just audio/video? |
478 return web_contents_->GetRenderWidgetHostView()->IsShowing(); | 479 return web_contents_->GetRenderWidgetHostView()->IsShowing(); |
479 #endif | 480 #endif |
480 return true; | 481 return true; |
481 } | 482 } |
OLD | NEW |