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

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_impl.h

Issue 9583036: Revert 124817 - 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, 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_ 5 #ifndef CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_ 6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 23 matching lines...) Expand all
34 virtual ~OffTheRecordProfileImpl(); 34 virtual ~OffTheRecordProfileImpl();
35 void Init(); 35 void Init();
36 36
37 // Profile implementation. 37 // Profile implementation.
38 virtual std::string GetProfileName() OVERRIDE; 38 virtual std::string GetProfileName() OVERRIDE;
39 virtual Profile* GetOffTheRecordProfile() OVERRIDE; 39 virtual Profile* GetOffTheRecordProfile() OVERRIDE;
40 virtual void DestroyOffTheRecordProfile() OVERRIDE; 40 virtual void DestroyOffTheRecordProfile() OVERRIDE;
41 virtual bool HasOffTheRecordProfile() OVERRIDE; 41 virtual bool HasOffTheRecordProfile() OVERRIDE;
42 virtual Profile* GetOriginalProfile() OVERRIDE; 42 virtual Profile* GetOriginalProfile() OVERRIDE;
43 virtual VisitedLinkMaster* GetVisitedLinkMaster() OVERRIDE; 43 virtual VisitedLinkMaster* GetVisitedLinkMaster() OVERRIDE;
44 virtual ExtensionPrefValueMap* GetExtensionPrefValueMap() OVERRIDE;
45 virtual ExtensionService* GetExtensionService() OVERRIDE; 44 virtual ExtensionService* GetExtensionService() OVERRIDE;
46 virtual UserScriptMaster* GetUserScriptMaster() OVERRIDE; 45 virtual UserScriptMaster* GetUserScriptMaster() OVERRIDE;
46 virtual ExtensionDevToolsManager* GetExtensionDevToolsManager() OVERRIDE;
47 virtual ExtensionProcessManager* GetExtensionProcessManager() OVERRIDE; 47 virtual ExtensionProcessManager* GetExtensionProcessManager() OVERRIDE;
48 virtual ExtensionMessageService* GetExtensionMessageService() OVERRIDE;
48 virtual ExtensionEventRouter* GetExtensionEventRouter() OVERRIDE; 49 virtual ExtensionEventRouter* GetExtensionEventRouter() OVERRIDE;
49 virtual ExtensionSpecialStoragePolicy* 50 virtual ExtensionSpecialStoragePolicy*
50 GetExtensionSpecialStoragePolicy() OVERRIDE; 51 GetExtensionSpecialStoragePolicy() OVERRIDE;
51 virtual GAIAInfoUpdateService* GetGAIAInfoUpdateService() OVERRIDE; 52 virtual GAIAInfoUpdateService* GetGAIAInfoUpdateService() OVERRIDE;
52 virtual HistoryService* GetHistoryService(ServiceAccessType sat) OVERRIDE; 53 virtual HistoryService* GetHistoryService(ServiceAccessType sat) OVERRIDE;
53 virtual HistoryService* GetHistoryServiceWithoutCreating() OVERRIDE; 54 virtual HistoryService* GetHistoryServiceWithoutCreating() OVERRIDE;
54 virtual FaviconService* GetFaviconService(ServiceAccessType sat) OVERRIDE; 55 virtual FaviconService* GetFaviconService(ServiceAccessType sat) OVERRIDE;
55 virtual AutocompleteClassifier* GetAutocompleteClassifier() OVERRIDE; 56 virtual AutocompleteClassifier* GetAutocompleteClassifier() OVERRIDE;
56 virtual history::ShortcutsBackend* GetShortcutsBackend() OVERRIDE; 57 virtual history::ShortcutsBackend* GetShortcutsBackend() OVERRIDE;
57 virtual WebDataService* GetWebDataService(ServiceAccessType sat) OVERRIDE; 58 virtual WebDataService* GetWebDataService(ServiceAccessType sat) OVERRIDE;
(...skipping 10 matching lines...) Expand all
68 virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE; 69 virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;
69 virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() OVERRIDE; 70 virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() OVERRIDE;
70 virtual BookmarkModel* GetBookmarkModel() OVERRIDE; 71 virtual BookmarkModel* GetBookmarkModel() OVERRIDE;
71 virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry() OVERRIDE; 72 virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry() OVERRIDE;
72 virtual TokenService* GetTokenService() OVERRIDE; 73 virtual TokenService* GetTokenService() OVERRIDE;
73 virtual bool IsSameProfile(Profile* profile) OVERRIDE; 74 virtual bool IsSameProfile(Profile* profile) OVERRIDE;
74 virtual Time GetStartTime() const OVERRIDE; 75 virtual Time GetStartTime() const OVERRIDE;
75 virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE; 76 virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE;
76 virtual history::TopSites* GetTopSites() OVERRIDE; 77 virtual history::TopSites* GetTopSites() OVERRIDE;
77 virtual void MarkAsCleanShutdown() OVERRIDE; 78 virtual void MarkAsCleanShutdown() OVERRIDE;
79 virtual void InitExtensions(bool extensions_enabled) OVERRIDE;
78 virtual void InitPromoResources() OVERRIDE; 80 virtual void InitPromoResources() OVERRIDE;
79 virtual void InitRegisteredProtocolHandlers() OVERRIDE; 81 virtual void InitRegisteredProtocolHandlers() OVERRIDE;
80 virtual FilePath last_selected_directory() OVERRIDE; 82 virtual FilePath last_selected_directory() OVERRIDE;
81 virtual void set_last_selected_directory(const FilePath& path) OVERRIDE; 83 virtual void set_last_selected_directory(const FilePath& path) OVERRIDE;
82 84
83 #if defined(OS_CHROMEOS) 85 #if defined(OS_CHROMEOS)
84 virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE; 86 virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE;
85 virtual void InitChromeOSPreferences() OVERRIDE; 87 virtual void InitChromeOSPreferences() OVERRIDE;
86 #endif // defined(OS_CHROMEOS) 88 #endif // defined(OS_CHROMEOS)
87 89
88 virtual void OnBrowserAdded(const Browser* browser) OVERRIDE; 90 virtual void OnBrowserAdded(const Browser* browser) OVERRIDE;
89 virtual void OnBrowserRemoved(const Browser* browser) OVERRIDE; 91 virtual void OnBrowserRemoved(const Browser* browser) OVERRIDE;
92 virtual ExtensionInfoMap* GetExtensionInfoMap() OVERRIDE;
90 virtual ChromeURLDataManager* GetChromeURLDataManager() OVERRIDE; 93 virtual ChromeURLDataManager* GetChromeURLDataManager() OVERRIDE;
91 virtual PromoCounter* GetInstantPromoCounter() OVERRIDE; 94 virtual PromoCounter* GetInstantPromoCounter() OVERRIDE;
92 95
93 #if defined(OS_CHROMEOS) 96 #if defined(OS_CHROMEOS)
94 virtual void ChangeAppLocale(const std::string& locale, 97 virtual void ChangeAppLocale(const std::string& locale,
95 AppLocaleChangedVia) OVERRIDE; 98 AppLocaleChangedVia) OVERRIDE;
96 virtual void OnLogin() OVERRIDE; 99 virtual void OnLogin() OVERRIDE;
97 #endif // defined(OS_CHROMEOS) 100 #endif // defined(OS_CHROMEOS)
98 101
99 virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE; 102 virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE;
(...skipping 29 matching lines...) Expand all
129 content::NotificationRegistrar registrar_; 132 content::NotificationRegistrar registrar_;
130 133
131 // The real underlying profile. 134 // The real underlying profile.
132 Profile* profile_; 135 Profile* profile_;
133 136
134 // Weak pointer owned by |profile_|. 137 // Weak pointer owned by |profile_|.
135 PrefService* prefs_; 138 PrefService* prefs_;
136 139
137 OffTheRecordProfileIOData::Handle io_data_; 140 OffTheRecordProfileIOData::Handle io_data_;
138 141
142 // Must be freed before |io_data_|. While |extension_process_manager_| still
143 // lives, we handle incoming resource requests from extension processes and
144 // those require access to the ResourceContext owned by |io_data_|.
145 scoped_ptr<ExtensionProcessManager> extension_process_manager_;
146
139 // We use a non-persistent content settings map for OTR. 147 // We use a non-persistent content settings map for OTR.
140 scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 148 scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
141 149
142 // Time we were started. 150 // Time we were started.
143 Time start_time_; 151 Time start_time_;
144 152
145 FilePath last_selected_directory_; 153 FilePath last_selected_directory_;
146 154
147 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 155 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
148 156
149 scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_; 157 scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;
150 158
151 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 159 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
152 }; 160 };
153 161
154 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_ 162 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/intents/web_intents_registry_factory.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698