| Index: chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.h b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| index 69793c09bc2c6be14c5c4eec59f66be9cf04d509..50ff902dad97970e1bdf664e52f289a9a18525b6 100644
|
| --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| @@ -5,25 +5,13 @@
|
| #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
|
| #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
|
|
|
| -#include <string>
|
| -
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "base/scoped_observer.h"
|
| -#include "chrome/browser/extensions/extension_management.h"
|
| #include "content/public/browser/navigation_controller.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "content/public/browser/web_ui_message_handler.h"
|
| -#include "extensions/browser/extension_prefs_observer.h"
|
| -#include "extensions/browser/warning_service.h"
|
|
|
| class ExtensionService;
|
| class GURL;
|
|
|
| -namespace base {
|
| -class FilePath;
|
| -class ListValue;
|
| -}
|
| -
|
| namespace content {
|
| class WebUIDataSource;
|
| }
|
| @@ -33,17 +21,10 @@ class PrefRegistrySyncable;
|
| }
|
|
|
| namespace extensions {
|
| -class Extension;
|
| -class ExtensionPrefs;
|
|
|
| // Extension Settings UI handler.
|
| -class ExtensionSettingsHandler
|
| - : public content::WebUIMessageHandler,
|
| - public content::WebContentsObserver,
|
| - public ExtensionManagement::Observer,
|
| - public ExtensionPrefsObserver,
|
| - public WarningService::Observer,
|
| - public base::SupportsWeakPtr<ExtensionSettingsHandler> {
|
| +class ExtensionSettingsHandler : public content::WebUIMessageHandler,
|
| + public content::WebContentsObserver {
|
| public:
|
| ExtensionSettingsHandler();
|
| ~ExtensionSettingsHandler() override;
|
| @@ -53,8 +34,7 @@ class ExtensionSettingsHandler
|
| void GetLocalizedValues(content::WebUIDataSource* source);
|
|
|
| private:
|
| - // content::WebContentsObserver implementation.
|
| - void RenderViewDeleted(content::RenderViewHost* render_view_host) override;
|
| + // WebContentsObserver implementation.
|
| void DidStartNavigationToPendingEntry(
|
| const GURL& url,
|
| content::NavigationController::ReloadType reload_type) override;
|
| @@ -62,39 +42,12 @@ class ExtensionSettingsHandler
|
| // WebUIMessageHandler implementation.
|
| void RegisterMessages() override;
|
|
|
| - // ExtensionPrefsObserver implementation.
|
| - void OnExtensionDisableReasonsChanged(const std::string& extension_id,
|
| - int disable_reasons) override;
|
| -
|
| - // ExtensionManagement::Observer implementation.
|
| - void OnExtensionManagementSettingsChanged() override;
|
| -
|
| - // WarningService::Observer implementation.
|
| - void ExtensionWarningsChanged() override;
|
| -
|
| // Helper method that reloads all unpacked extensions.
|
| void ReloadUnpackedExtensions();
|
|
|
| - // Callback for the "extensionSettingsRegister" message.
|
| - void HandleRegisterMessage(const base::ListValue* args);
|
| -
|
| - // Forces a UI update if appropriate after a notification is received.
|
| - void MaybeUpdateAfterNotification();
|
| -
|
| // Our model. Outlives us since it's owned by our containing profile.
|
| ExtensionService* extension_service_;
|
|
|
| - ScopedObserver<WarningService, WarningService::Observer>
|
| - warning_service_observer_;
|
| -
|
| - // An observer to listen for notable changes in the ExtensionPrefs, like
|
| - // a change in Disable Reasons.
|
| - ScopedObserver<ExtensionPrefs, ExtensionPrefsObserver>
|
| - extension_prefs_observer_;
|
| -
|
| - ScopedObserver<ExtensionManagement, ExtensionManagement::Observer>
|
| - extension_management_observer_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsHandler);
|
| };
|
|
|
|
|