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

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

Issue 8997012: Make incognito windows not inherit HSTS state from the main profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 8 years, 11 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) 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_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 14 matching lines...) Expand all
25 class ChromeBlobStorageContext; 25 class ChromeBlobStorageContext;
26 class CookieSettings; 26 class CookieSettings;
27 class DesktopNotificationService; 27 class DesktopNotificationService;
28 class DownloadIdFactory; 28 class DownloadIdFactory;
29 class ExtensionInfoMap; 29 class ExtensionInfoMap;
30 class HostContentSettingsMap; 30 class HostContentSettingsMap;
31 class HostZoomMap; 31 class HostZoomMap;
32 class IOThread; 32 class IOThread;
33 class Profile; 33 class Profile;
34 class ProtocolHandlerRegistry; 34 class ProtocolHandlerRegistry;
35 class TransportSecurityPersister;
36 35
37 namespace fileapi { 36 namespace fileapi {
38 class FileSystemContext; 37 class FileSystemContext;
39 } // namespace fileapi 38 } // namespace fileapi
40 39
41 namespace media_stream { 40 namespace media_stream {
42 class MediaStreamManager; 41 class MediaStreamManager;
43 } // namespace media_stream 42 } // namespace media_stream
44 43
45 namespace net { 44 namespace net {
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_; 294 mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
296 295
297 // TODO(willchan): Remove from ResourceContext. 296 // TODO(willchan): Remove from ResourceContext.
298 mutable scoped_refptr<ExtensionInfoMap> extension_info_map_; 297 mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
299 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 298 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
300 mutable scoped_refptr<CookieSettings> cookie_settings_; 299 mutable scoped_refptr<CookieSettings> cookie_settings_;
301 mutable DesktopNotificationService* notification_service_; 300 mutable DesktopNotificationService* notification_service_;
302 301
303 mutable ResourceContext resource_context_; 302 mutable ResourceContext resource_context_;
304 303
305 mutable scoped_ptr<TransportSecurityPersister>
306 transport_security_persister_;
307
308 // These are only valid in between LazyInitialize() and their accessor being 304 // These are only valid in between LazyInitialize() and their accessor being
309 // called. 305 // called.
310 mutable scoped_refptr<ChromeURLRequestContext> main_request_context_; 306 mutable scoped_refptr<ChromeURLRequestContext> main_request_context_;
311 mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_; 307 mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_;
312 // One AppRequestContext per isolated app. 308 // One AppRequestContext per isolated app.
313 mutable AppRequestContextMap app_request_context_map_; 309 mutable AppRequestContextMap app_request_context_map_;
314 310
315 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 311 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
316 bool initialized_on_UI_thread_; 312 bool initialized_on_UI_thread_;
317 313
318 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 314 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
319 }; 315 };
320 316
321 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 317 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698