| Index: chrome/browser/ui/website_settings/website_settings.cc
|
| diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
|
| index daf7257bd63da56d291c118cbe81031646607196..8a37c39e6e9d6d36c0257363286fe0b1b40bf003 100644
|
| --- a/chrome/browser/ui/website_settings/website_settings.cc
|
| +++ b/chrome/browser/ui/website_settings/website_settings.cc
|
| @@ -143,12 +143,18 @@ void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type,
|
| secondary_pattern = ContentSettingsPattern::Wildcard();
|
| // Set permission for both microphone and camera.
|
| content_settings_->SetContentSetting(
|
| - primary_pattern, secondary_pattern,
|
| - CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "", setting);
|
| + primary_pattern,
|
| + secondary_pattern,
|
| + CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
|
| + std::string(),
|
| + setting);
|
|
|
| content_settings_->SetContentSetting(
|
| - primary_pattern, secondary_pattern,
|
| - CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "", setting);
|
| + primary_pattern,
|
| + secondary_pattern,
|
| + CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
|
| + std::string(),
|
| + setting);
|
| break;
|
| }
|
| default:
|
| @@ -167,7 +173,7 @@ void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type,
|
| // can not create media settings exceptions by hand.
|
| content_settings::SettingInfo info;
|
| scoped_ptr<Value> v(content_settings_->GetWebsiteSetting(
|
| - site_url_, site_url_, type, "", &info));
|
| + site_url_, site_url_, type, std::string(), &info));
|
| DCHECK(info.source == content_settings::SETTING_SOURCE_USER);
|
| ContentSettingsPattern::Relation r1 =
|
| info.primary_pattern.Compare(primary_pattern);
|
| @@ -188,7 +194,7 @@ void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type,
|
| if (setting != CONTENT_SETTING_DEFAULT)
|
| value = Value::CreateIntegerValue(setting);
|
| content_settings_->SetWebsiteSetting(
|
| - primary_pattern, secondary_pattern, type, "", value);
|
| + primary_pattern, secondary_pattern, type, std::string(), value);
|
| }
|
|
|
| show_info_bar_ = true;
|
| @@ -452,14 +458,20 @@ void WebsiteSettings::PresentSitePermissions() {
|
| content_settings::SettingInfo info;
|
| if (permission_info.type == CONTENT_SETTINGS_TYPE_MEDIASTREAM) {
|
| scoped_ptr<base::Value> mic_value(content_settings_->GetWebsiteSetting(
|
| - site_url_, site_url_, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
|
| - "", &info));
|
| + site_url_,
|
| + site_url_,
|
| + CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
|
| + std::string(),
|
| + &info));
|
| ContentSetting mic_setting =
|
| content_settings::ValueToContentSetting(mic_value.get());
|
|
|
| scoped_ptr<base::Value> camera_value(content_settings_->GetWebsiteSetting(
|
| - site_url_, site_url_, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
|
| - "", &info));
|
| + site_url_,
|
| + site_url_,
|
| + CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
|
| + std::string(),
|
| + &info));
|
| ContentSetting camera_setting =
|
| content_settings::ValueToContentSetting(camera_value.get());
|
|
|
| @@ -469,7 +481,7 @@ void WebsiteSettings::PresentSitePermissions() {
|
| permission_info.setting = mic_setting;
|
| } else {
|
| scoped_ptr<Value> value(content_settings_->GetWebsiteSetting(
|
| - site_url_, site_url_, permission_info.type, "", &info));
|
| + site_url_, site_url_, permission_info.type, std::string(), &info));
|
| DCHECK(value.get());
|
| if (value->GetType() == Value::TYPE_INTEGER) {
|
| permission_info.setting =
|
|
|