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

Unified Diff: chrome/browser/extensions/extension_service.h

Issue 7775008: Enable sync for the settings from the Extension Settings API. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Comments, GCC compile fix Created 9 years, 3 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
Index: chrome/browser/extensions/extension_service.h
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 276406cd500848793bfe8191d068724cb129ee31..361d4d16402bc7684449b320b94f526f63b5c6de 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -28,6 +28,7 @@
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_permissions_api.h"
#include "chrome/browser/extensions/extension_process_manager.h"
+#include "chrome/browser/extensions/extension_settings_ui_wrapper.h"
#include "chrome/browser/extensions/extension_sync_data.h"
#include "chrome/browser/extensions/extension_toolbar_model.h"
#include "chrome/browser/extensions/extensions_quota_service.h"
@@ -55,7 +56,6 @@ class ExtensionInstallUI;
class ExtensionManagementEventRouter;
class ExtensionPreferenceEventRouter;
class ExtensionServiceBackend;
-class ExtensionSettings;
class ExtensionSyncData;
class ExtensionToolbarModel;
class ExtensionUpdater;
@@ -178,7 +178,6 @@ class ExtensionService
const CommandLine* command_line,
const FilePath& install_directory,
ExtensionPrefs* extension_prefs,
- ExtensionSettings* extension_settings,
bool autoupdate_enabled,
bool extensions_enabled);
@@ -437,7 +436,7 @@ class ExtensionService
// ExtensionPrefs* mutable_extension_prefs().
ExtensionPrefs* extension_prefs();
- ExtensionSettings* extension_settings();
+ ExtensionSettingsUIWrapper* extension_settings();
ExtensionContentSettingsStore* GetExtensionContentSettingsStore();
@@ -666,8 +665,8 @@ class ExtensionService
// Preferences for the owning profile (weak reference).
ExtensionPrefs* extension_prefs_;
- // Settings for the owning profile (weak reference).
- ExtensionSettings* extension_settings_;
+ // Settings for the owning profile.
+ scoped_ptr<ExtensionSettingsUIWrapper> extension_settings_;
akalin 2011/09/20 14:53:11 no need to make this a scoped_ptr; just have 'Exte
not at google - send to devlin 2011/09/21 00:20:14 Done.
// The current list of installed extensions.
// TODO(aa): This should use chrome/common/extensions/extension_set.h.

Powered by Google App Engine
This is Rietveld 408576698