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