| 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 4eea56ba18cd5ea5815d8c41df4e757b36b43140..1c0c8be6359c81f0d1aaab76b0fb0bd0df8589b3 100644
|
| --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
|
| @@ -24,6 +24,7 @@
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "content/public/browser/web_ui_message_handler.h"
|
| #include "extensions/browser/extension_prefs.h"
|
| +#include "extensions/browser/extension_prefs_observer.h"
|
| #include "ui/shell_dialogs/select_file_dialog.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -70,7 +71,7 @@ class ExtensionSettingsHandler
|
| public ui::SelectFileDialog::Listener,
|
| public ErrorConsole::Observer,
|
| public ExtensionInstallPrompt::Delegate,
|
| - public ExtensionPrefs::Observer,
|
| + public ExtensionPrefsObserver,
|
| public ExtensionUninstallDialog::Delegate,
|
| public ExtensionWarningService::Observer,
|
| public base::SupportsWeakPtr<ExtensionSettingsHandler> {
|
| @@ -139,7 +140,7 @@ class ExtensionSettingsHandler
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
|
|
| - // ExtensionPrefs::Observer implementation.
|
| + // ExtensionPrefsObserver implementation.
|
| virtual void OnExtensionDisableReasonsChanged(const std::string& extension_id,
|
| int disable_reasons) OVERRIDE;
|
|
|
| @@ -305,7 +306,7 @@ class ExtensionSettingsHandler
|
|
|
| // An observer to listen for notable changes in the ExtensionPrefs, like
|
| // a change in Disable Reasons.
|
| - ScopedObserver<ExtensionPrefs, ExtensionPrefs::Observer>
|
| + ScopedObserver<ExtensionPrefs, ExtensionPrefsObserver>
|
| extension_prefs_observer_;
|
|
|
| // Whether we found any DISABLE_NOT_VERIFIED extensions and want to kick off
|
|
|