Index: chrome/browser/profiles/off_the_record_profile_impl.h |
=================================================================== |
--- chrome/browser/profiles/off_the_record_profile_impl.h (revision 124830) |
+++ chrome/browser/profiles/off_the_record_profile_impl.h (working copy) |
@@ -41,10 +41,11 @@ |
virtual bool HasOffTheRecordProfile() OVERRIDE; |
virtual Profile* GetOriginalProfile() OVERRIDE; |
virtual VisitedLinkMaster* GetVisitedLinkMaster() OVERRIDE; |
- virtual ExtensionPrefValueMap* GetExtensionPrefValueMap() OVERRIDE; |
virtual ExtensionService* GetExtensionService() OVERRIDE; |
virtual UserScriptMaster* GetUserScriptMaster() OVERRIDE; |
+ virtual ExtensionDevToolsManager* GetExtensionDevToolsManager() OVERRIDE; |
virtual ExtensionProcessManager* GetExtensionProcessManager() OVERRIDE; |
+ virtual ExtensionMessageService* GetExtensionMessageService() OVERRIDE; |
virtual ExtensionEventRouter* GetExtensionEventRouter() OVERRIDE; |
virtual ExtensionSpecialStoragePolicy* |
GetExtensionSpecialStoragePolicy() OVERRIDE; |
@@ -75,6 +76,7 @@ |
virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE; |
virtual history::TopSites* GetTopSites() 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; |
@@ -87,6 +89,7 @@ |
virtual void OnBrowserAdded(const Browser* browser) OVERRIDE; |
virtual void OnBrowserRemoved(const Browser* browser) OVERRIDE; |
+ virtual ExtensionInfoMap* GetExtensionInfoMap() OVERRIDE; |
virtual ChromeURLDataManager* GetChromeURLDataManager() OVERRIDE; |
virtual PromoCounter* GetInstantPromoCounter() OVERRIDE; |
@@ -136,6 +139,11 @@ |
OffTheRecordProfileIOData::Handle io_data_; |
+ // Must be freed 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_; |
+ |
// We use a non-persistent content settings map for OTR. |
scoped_refptr<HostContentSettingsMap> host_content_settings_map_; |