| Index: chrome/browser/ui/webui/options/content_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| index a1bf593d8859a04e023ddeecc7aec244827353bd..3964c4addfe28a1b5c9a90c9caa98754a50b4de8 100644
|
| --- a/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| @@ -33,6 +33,8 @@
|
| #include "components/content_settings/core/browser/content_settings_utils.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| #include "components/content_settings/core/browser/plugins_field_trial.h"
|
| +#include "components/content_settings/core/browser/website_settings_info.h"
|
| +#include "components/content_settings/core/browser/website_settings_registry.h"
|
| #include "components/content_settings/core/common/content_settings.h"
|
| #include "components/content_settings/core/common/content_settings_pattern.h"
|
| #include "components/google/core/browser/google_util.h"
|
| @@ -408,8 +410,10 @@ void ContentSettingsHandler::GetLocalizedValues(
|
| RegisterStrings(localized_strings, resources, arraysize(resources));
|
|
|
| PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
|
| - const base::Value* default_pref =
|
| - prefs->GetDefaultPrefValue(prefs::kDefaultPluginsSetting);
|
| + const base::Value* default_pref = prefs->GetDefaultPrefValue(
|
| + content_settings::WebsiteSettingsRegistry::GetInstance()
|
| + ->Get(CONTENT_SETTINGS_TYPE_PLUGINS)
|
| + ->default_value_pref_name());
|
|
|
| int default_value = CONTENT_SETTING_DEFAULT;
|
| bool success = default_pref->GetAsInteger(&default_value);
|
|
|