diff options
Diffstat (limited to 'chrome/browser/ui/website_settings/website_settings.cc')
| -rw-r--r-- | chrome/browser/ui/website_settings/website_settings.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc index 53c5146..b3c6571 100644 --- a/chrome/browser/ui/website_settings/website_settings.cc +++ b/chrome/browser/ui/website_settings/website_settings.cc @@ -231,7 +231,7 @@ void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type, // This is not a concern for CONTENT_SETTINGS_TYPE_MEDIASTREAM since users // can not create media settings exceptions by hand. content_settings::SettingInfo info; - scoped_ptr<Value> v(content_settings_->GetWebsiteSetting( + scoped_ptr<base::Value> v(content_settings_->GetWebsiteSetting( site_url_, site_url_, type, std::string(), &info)); DCHECK(info.source == content_settings::SETTING_SOURCE_USER); ContentSettingsPattern::Relation r1 = @@ -249,9 +249,9 @@ void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type, secondary_pattern = info.secondary_pattern; } - Value* value = NULL; + base::Value* value = NULL; if (setting != CONTENT_SETTING_DEFAULT) - value = Value::CreateIntegerValue(setting); + value = base::Value::CreateIntegerValue(setting); content_settings_->SetWebsiteSetting( primary_pattern, secondary_pattern, type, std::string(), value); } @@ -579,10 +579,10 @@ void WebsiteSettings::PresentSitePermissions() { else permission_info.setting = mic_setting; } else { - scoped_ptr<Value> value(content_settings_->GetWebsiteSetting( + scoped_ptr<base::Value> value(content_settings_->GetWebsiteSetting( site_url_, site_url_, permission_info.type, std::string(), &info)); DCHECK(value.get()); - if (value->GetType() == Value::TYPE_INTEGER) { + if (value->GetType() == base::Value::TYPE_INTEGER) { permission_info.setting = content_settings::ValueToContentSetting(value.get()); } else { |