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

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

Issue 8591024: Correct the order of destruction of ProfileImplIOData and ExtensionProcessManager. This was causi... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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
« no previous file with comments | « no previous file | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 void CreateQuotaManagerAndClients(); 140 void CreateQuotaManagerAndClients();
141 141
142 content::NotificationRegistrar registrar_; 142 content::NotificationRegistrar registrar_;
143 143
144 // The real underlying profile. 144 // The real underlying profile.
145 Profile* profile_; 145 Profile* profile_;
146 146
147 // Weak pointer owned by |profile_|. 147 // Weak pointer owned by |profile_|.
148 PrefService* prefs_; 148 PrefService* prefs_;
149 149
150 OffTheRecordProfileIOData::Handle io_data_;
151
152 // Must be freed before |io_data_|. While |extension_process_manager_| still
153 // lives, we handle incoming resource requests from extension processes and
154 // those require access to the ResourceContext owned by |io_data_|.
150 scoped_ptr<ExtensionProcessManager> extension_process_manager_; 155 scoped_ptr<ExtensionProcessManager> extension_process_manager_;
151 156
152 OffTheRecordProfileIOData::Handle io_data_;
153
154 // We use a non-persistent content settings map for OTR. 157 // We use a non-persistent content settings map for OTR.
155 scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 158 scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
156 159
157 // Use a separate zoom map for OTR. 160 // Use a separate zoom map for OTR.
158 scoped_refptr<HostZoomMap> host_zoom_map_; 161 scoped_refptr<HostZoomMap> host_zoom_map_;
159 162
160 // Use a special WebKit context for OTR browsing. 163 // Use a special WebKit context for OTR browsing.
161 scoped_refptr<WebKitContext> webkit_context_; 164 scoped_refptr<WebKitContext> webkit_context_;
162 165
163 // We don't want SSLHostState from the OTR profile to leak back to the main 166 // We don't want SSLHostState from the OTR profile to leak back to the main
164 // profile because then the main profile would learn some of the host names 167 // profile because then the main profile would learn some of the host names
165 // the user visited while OTR. 168 // the user visited while OTR.
166 scoped_ptr<SSLHostState> ssl_host_state_; 169 scoped_ptr<SSLHostState> ssl_host_state_;
167
168 // Use a separate FindBarState so search terms do not leak back to the main 170 // Use a separate FindBarState so search terms do not leak back to the main
169 // profile. 171 // profile.
170 scoped_ptr<FindBarState> find_bar_state_; 172 scoped_ptr<FindBarState> find_bar_state_;
171 173
172 // Time we were started. 174 // Time we were started.
173 Time start_time_; 175 Time start_time_;
174 176
175 scoped_refptr<ChromeAppCacheService> appcache_service_; 177 scoped_refptr<ChromeAppCacheService> appcache_service_;
176 178
177 // The main database tracker for this profile. 179 // The main database tracker for this profile.
(...skipping 10 matching lines...) Expand all
188 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 190 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
189 191
190 scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_; 192 scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;
191 193
192 scoped_refptr<quota::QuotaManager> quota_manager_; 194 scoped_refptr<quota::QuotaManager> quota_manager_;
193 195
194 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 196 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
195 }; 197 };
196 198
197 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_ 199 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698