| 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 7cca3a32a5c4d2499154b1e16a68419f1735bbf5..1218e08443008a8bf3b6d4c889dbeeb50ff78b2e 100644
|
| --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| @@ -10,11 +10,11 @@
|
| #include <vector>
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "base/prefs/pref_change_registrar.h"
|
| #include "base/scoped_observer.h"
|
| #include "chrome/browser/extensions/error_console/error_console.h"
|
| #include "chrome/browser/extensions/extension_install_prompt.h"
|
| #include "chrome/browser/extensions/extension_install_ui.h"
|
| +#include "chrome/browser/extensions/extension_management.h"
|
| #include "chrome/browser/extensions/extension_uninstall_dialog.h"
|
| #include "chrome/browser/extensions/requirements_checker.h"
|
| #include "content/public/browser/navigation_controller.h"
|
| @@ -71,6 +71,7 @@ class ExtensionSettingsHandler
|
| public content::WebContentsObserver,
|
| public ErrorConsole::Observer,
|
| public ExtensionInstallPrompt::Delegate,
|
| + public ExtensionManagement::Observer,
|
| public ExtensionPrefsObserver,
|
| public ExtensionRegistryObserver,
|
| public ExtensionUninstallDialog::Delegate,
|
| @@ -134,6 +135,9 @@ class ExtensionSettingsHandler
|
| virtual void OnExtensionDisableReasonsChanged(const std::string& extension_id,
|
| int disable_reasons) OVERRIDE;
|
|
|
| + // ExtensionManagement::Observer implementation.
|
| + virtual void OnExtensionManagementSettingsChanged() OVERRIDE;
|
| +
|
| // ExtensionUninstallDialog::Delegate implementation, used for receiving
|
| // notification about uninstall confirmation dialog selections.
|
| virtual void ExtensionUninstallAccepted() OVERRIDE;
|
| @@ -276,8 +280,6 @@ class ExtensionSettingsHandler
|
|
|
| content::NotificationRegistrar registrar_;
|
|
|
| - PrefChangeRegistrar pref_registrar_;
|
| -
|
| // This will not be empty when a requirements check is in progress. Doing
|
| // another Check() before the previous one is complete will cause the first
|
| // one to abort.
|
| @@ -300,6 +302,9 @@ class ExtensionSettingsHandler
|
| ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
|
| extension_registry_observer_;
|
|
|
| + ScopedObserver<ExtensionManagement, ExtensionManagement::Observer>
|
| + extension_management_observer_;
|
| +
|
| // Whether we found any DISABLE_NOT_VERIFIED extensions and want to kick off
|
| // a verification check to try and rescue them.
|
| bool should_do_verification_check_;
|
|
|