Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(678)

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.h

Issue 220353002: Remove //chrome dependency from ExtensionPrefs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't ref ContentSettingsStore if !ENABLE_EXTENSIONS Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/test_extension_system.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/browser/extensions/test_extension_system.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698