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

Unified Diff: chrome/browser/media/media_stream_devices_controller.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc
index 9ce4f62414b6d8c1b1c40507fd6ed335d6619729..ef876bae3e02778d4552ca82041a58b1cf8d289b 100644
--- a/chrome/browser/media/media_stream_devices_controller.cc
+++ b/chrome/browser/media/media_stream_devices_controller.cc
@@ -8,6 +8,7 @@
#include "base/prefs/scoped_user_pref_update.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
#include "chrome/browser/media/media_permission.h"
@@ -287,16 +288,18 @@ content::MediaStreamDevices MediaStreamDevicesController::GetDevices(
} // switch
if (audio_allowed) {
- profile_->GetHostContentSettingsMap()->UpdateLastUsageByPattern(
- ContentSettingsPattern::FromURLNoWildcard(request_.security_origin),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
+ HostContentSettingsMapFactory::GetForProfile(profile_)
+ ->UpdateLastUsageByPattern(
+ ContentSettingsPattern::FromURLNoWildcard(request_.security_origin),
+ ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
}
if (video_allowed) {
- profile_->GetHostContentSettingsMap()->UpdateLastUsageByPattern(
- ContentSettingsPattern::FromURLNoWildcard(request_.security_origin),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
+ HostContentSettingsMapFactory::GetForProfile(profile_)
+ ->UpdateLastUsageByPattern(
+ ContentSettingsPattern::FromURLNoWildcard(request_.security_origin),
+ ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
}
return devices;
@@ -348,7 +351,7 @@ void MediaStreamDevicesController::StorePermission(
if (IsAskingForAudio() && new_audio_setting != CONTENT_SETTING_ASK) {
if (ShouldPersistContentSetting(new_audio_setting, request_.security_origin,
is_pepper_request)) {
- profile_->GetHostContentSettingsMap()->SetContentSetting(
+ HostContentSettingsMapFactory::GetForProfile(profile_)->SetContentSetting(
primary_pattern, ContentSettingsPattern::Wildcard(),
CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(),
new_audio_setting);
@@ -357,7 +360,7 @@ void MediaStreamDevicesController::StorePermission(
if (IsAskingForVideo() && new_video_setting != CONTENT_SETTING_ASK) {
if (ShouldPersistContentSetting(new_video_setting, request_.security_origin,
is_pepper_request)) {
- profile_->GetHostContentSettingsMap()->SetContentSetting(
+ HostContentSettingsMapFactory::GetForProfile(profile_)->SetContentSetting(
primary_pattern, ContentSettingsPattern::Wildcard(),
CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(),
new_video_setting);

Powered by Google App Engine
This is Rietveld 408576698