| Index: chrome/browser/ui/webui/options2/core_options_handler2.h
|
| diff --git a/chrome/browser/ui/webui/options2/core_options_handler2.h b/chrome/browser/ui/webui/options2/core_options_handler2.h
|
| index b63d3e3f65285fdfce5d5a37ce0c4b3965ce5776..da1989a19c9d6c0472a655233b2aa5a93be321c2 100644
|
| --- a/chrome/browser/ui/webui/options2/core_options_handler2.h
|
| +++ b/chrome/browser/ui/webui/options2/core_options_handler2.h
|
| @@ -10,7 +10,9 @@
|
| #include <string>
|
|
|
| #include "base/values.h"
|
| +#include "chrome/browser/pepper_flash_settings_helper.h"
|
| #include "chrome/browser/plugin_data_remover_helper.h"
|
| +#include "chrome/browser/plugin_status_pref_setter.h"
|
| #include "chrome/browser/prefs/pref_change_registrar.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/ui/webui/options2/options_ui2.h"
|
| @@ -145,13 +147,18 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
|
| void HandleUserMetricsAction(const ListValue* args);
|
|
|
| void UpdateClearPluginLSOData();
|
| + void UpdatePepperFlashSettingsEnabled();
|
|
|
| OptionsPageUIHandlerHost* handlers_host_;
|
| PrefChangeRegistrar registrar_;
|
|
|
| + PluginStatusPrefSetter plugin_status_pref_setter_;
|
| // Used for asynchronously updating the preference stating whether clearing
|
| // LSO data is supported.
|
| PluginDataRemoverHelper clear_plugin_lso_data_enabled_;
|
| + // Used for asynchronously updating the preference stating whether we should
|
| + // show Pepper Flash-specific settings.
|
| + PepperFlashSettingsHelper pepper_flash_settings_enabled_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CoreOptionsHandler);
|
| };
|
|
|