OLD | NEW |
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_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 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/browser/io_thread.h" | 21 #include "chrome/browser/io_thread.h" |
22 #include "chrome/browser/profiles/profile.h" | 22 #include "chrome/browser/profiles/profile.h" |
23 #include "chrome/browser/profiles/storage_partition_descriptor.h" | 23 #include "chrome/browser/profiles/storage_partition_descriptor.h" |
24 #include "components/content_settings/core/common/content_settings_types.h" | 24 #include "components/content_settings/core/common/content_settings_types.h" |
25 #include "content/public/browser/content_browser_client.h" | 25 #include "content/public/browser/content_browser_client.h" |
26 #include "content/public/browser/resource_context.h" | 26 #include "content/public/browser/resource_context.h" |
27 #include "net/cookies/cookie_monster.h" | 27 #include "net/cookies/cookie_monster.h" |
28 #include "net/http/http_cache.h" | 28 #include "net/http/http_cache.h" |
29 #include "net/http/http_network_session.h" | 29 #include "net/http/http_network_session.h" |
30 #include "net/url_request/url_request_context.h" | 30 #include "net/url_request/url_request_context.h" |
| 31 #include "net/url_request/url_request_interceptor.h" |
31 #include "net/url_request/url_request_job_factory.h" | 32 #include "net/url_request/url_request_job_factory.h" |
32 | 33 |
33 class ChromeHttpUserAgentSettings; | 34 class ChromeHttpUserAgentSettings; |
34 class ChromeNetworkDelegate; | 35 class ChromeNetworkDelegate; |
35 class ChromeURLRequestContextGetter; | 36 class ChromeURLRequestContextGetter; |
36 class CookieSettings; | 37 class CookieSettings; |
37 class DevToolsNetworkController; | 38 class DevToolsNetworkController; |
38 class HostContentSettingsMap; | 39 class HostContentSettingsMap; |
39 class MediaDeviceIDSalt; | 40 class MediaDeviceIDSalt; |
40 class ProtocolHandlerRegistry; | 41 class ProtocolHandlerRegistry; |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver> | 310 scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver> |
310 resource_prefetch_predictor_observer_; | 311 resource_prefetch_predictor_observer_; |
311 | 312 |
312 // This pointer exists only as a means of conveying a url job factory | 313 // This pointer exists only as a means of conveying a url job factory |
313 // pointer from the protocol handler registry on the UI thread to the | 314 // pointer from the protocol handler registry on the UI thread to the |
314 // the URLRequestContext on the IO thread. The consumer MUST take | 315 // the URLRequestContext on the IO thread. The consumer MUST take |
315 // ownership of the object by calling release() on this pointer. | 316 // ownership of the object by calling release() on this pointer. |
316 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> | 317 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> |
317 protocol_handler_interceptor; | 318 protocol_handler_interceptor; |
318 | 319 |
| 320 // Holds the URLRequestInterceptor pointer that is created on the UI thread |
| 321 // and then passed to the list of request_interceptors on the IO thread. |
| 322 scoped_ptr<net::URLRequestInterceptor> new_tab_page_interceptor; |
| 323 |
319 // We need to initialize the ProxyConfigService from the UI thread | 324 // We need to initialize the ProxyConfigService from the UI thread |
320 // because on linux it relies on initializing things through gconf, | 325 // because on linux it relies on initializing things through gconf, |
321 // and needs to be on the main thread. | 326 // and needs to be on the main thread. |
322 scoped_ptr<net::ProxyConfigService> proxy_config_service; | 327 scoped_ptr<net::ProxyConfigService> proxy_config_service; |
323 | 328 |
324 #if defined(ENABLE_SUPERVISED_USERS) | 329 #if defined(ENABLE_SUPERVISED_USERS) |
325 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter; | 330 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter; |
326 #endif | 331 #endif |
327 | 332 |
328 #if defined(OS_CHROMEOS) | 333 #if defined(OS_CHROMEOS) |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
621 | 626 |
622 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 627 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
623 bool initialized_on_UI_thread_; | 628 bool initialized_on_UI_thread_; |
624 | 629 |
625 const Profile::ProfileType profile_type_; | 630 const Profile::ProfileType profile_type_; |
626 | 631 |
627 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 632 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
628 }; | 633 }; |
629 | 634 |
630 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 635 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
OLD | NEW |