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

Unified Diff: chrome/browser/profiles/profile_impl.h

Issue 9369013: Take extensions out of Profile into a profile-keyed service, ExtensionSystem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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/profiles/profile_impl.h
diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
index a4ef65fd5099562cba23987bd33e4b43ab1b8c4f..9f474e661ee46882a5d3b73354aedbdf9bab7e6c 100644
--- a/chrome/browser/profiles/profile_impl.h
+++ b/chrome/browser/profiles/profile_impl.h
@@ -21,8 +21,8 @@
#include "content/public/browser/notification_registrar.h"
class ExtensionNavigationObserver;
-class ExtensionPrefs;
class ExtensionPrefValueMap;
+class ExtensionSystem;
class NetPrefObserver;
class PrefService;
class PromoResourceService;
@@ -76,11 +76,9 @@ class ProfileImpl : public Profile,
virtual history::TopSites* GetTopSites() OVERRIDE;
virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE;
virtual VisitedLinkMaster* GetVisitedLinkMaster() OVERRIDE;
- virtual UserScriptMaster* GetUserScriptMaster() OVERRIDE;
virtual ExtensionService* GetExtensionService() OVERRIDE;
- virtual ExtensionDevToolsManager* GetExtensionDevToolsManager() OVERRIDE;
+ virtual UserScriptMaster* GetUserScriptMaster() OVERRIDE;
virtual ExtensionProcessManager* GetExtensionProcessManager() OVERRIDE;
- virtual ExtensionMessageService* GetExtensionMessageService() OVERRIDE;
virtual ExtensionEventRouter* GetExtensionEventRouter() OVERRIDE;
virtual ExtensionSpecialStoragePolicy*
GetExtensionSpecialStoragePolicy() OVERRIDE;
@@ -100,11 +98,6 @@ class ProfileImpl : public Profile,
GetRequestContextForExtensions() OVERRIDE;
virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp(
const std::string& app_id) OVERRIDE;
- virtual void RegisterExtensionWithRequestContexts(
- const Extension* extension) OVERRIDE;
- virtual void UnregisterExtensionWithRequestContexts(
- const std::string& extension_id,
- const extension_misc::UnloadedExtensionReason reason) OVERRIDE;
virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;
virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;
virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() OVERRIDE;
@@ -114,13 +107,11 @@ class ProfileImpl : public Profile,
virtual bool IsSameProfile(Profile* profile) OVERRIDE;
virtual base::Time GetStartTime() const OVERRIDE;
virtual void MarkAsCleanShutdown() OVERRIDE;
- virtual void InitExtensions(bool extensions_enabled) OVERRIDE;
virtual void InitPromoResources() OVERRIDE;
virtual void InitRegisteredProtocolHandlers() OVERRIDE;
virtual FilePath last_selected_directory() OVERRIDE;
virtual void set_last_selected_directory(const FilePath& path) OVERRIDE;
virtual TokenService* GetTokenService() OVERRIDE;
- virtual ExtensionInfoMap* GetExtensionInfoMap() OVERRIDE;
virtual PromoCounter* GetInstantPromoCounter() OVERRIDE;
virtual ChromeURLDataManager* GetChromeURLDataManager() OVERRIDE;
virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;
@@ -208,22 +199,6 @@ class ProfileImpl : public Profile,
scoped_ptr<VisitedLinkEventListener> visited_link_event_listener_;
scoped_ptr<VisitedLinkMaster> visited_link_master_;
ProfileImplIOData::Handle io_data_;
- // Keep extension_prefs_ on top of extension_service_ because the latter
- // maintains a pointer to the first and shall be destructed first.
- scoped_ptr<ExtensionPrefs> extension_prefs_;
- scoped_ptr<ExtensionService> extension_service_;
- scoped_refptr<UserScriptMaster> user_script_master_;
- scoped_refptr<ExtensionDevToolsManager> extension_devtools_manager_;
- // extension_info_map_ needs to outlive extension_process_manager_.
- scoped_refptr<ExtensionInfoMap> extension_info_map_;
- // |extension_process_manager_| must be destroyed before |io_data_|.
- // While |extension_process_manager_| still lives, we handle incoming
- // resource requests from extension processes and those require access
- // to the ResourceContext owned by |io_data_|.
- scoped_ptr<ExtensionProcessManager> extension_process_manager_;
- scoped_refptr<ExtensionMessageService> extension_message_service_;
- scoped_ptr<ExtensionEventRouter> extension_event_router_;
- scoped_ptr<ExtensionNavigationObserver> extension_navigation_observer_;
scoped_refptr<ExtensionSpecialStoragePolicy>
extension_special_storage_policy_;
scoped_ptr<SSLHostState> ssl_host_state_;

Powered by Google App Engine
This is Rietveld 408576698