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

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

Issue 462423004: Revert CL 117933003. Re-add resource speculative prefetching code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 3 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_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 24 matching lines...) Expand all
35 class ChromeNetworkDelegate; 35 class ChromeNetworkDelegate;
36 class ChromeURLRequestContextGetter; 36 class ChromeURLRequestContextGetter;
37 class CookieSettings; 37 class CookieSettings;
38 class DevToolsNetworkController; 38 class DevToolsNetworkController;
39 class HostContentSettingsMap; 39 class HostContentSettingsMap;
40 class MediaDeviceIDSalt; 40 class MediaDeviceIDSalt;
41 class ProtocolHandlerRegistry; 41 class ProtocolHandlerRegistry;
42 class SigninNamesOnIOThread; 42 class SigninNamesOnIOThread;
43 class SupervisedUserURLFilter; 43 class SupervisedUserURLFilter;
44 44
45 namespace chrome_browser_net {
46 class ResourcePrefetchPredictorObserver;
47 }
48
45 namespace extensions { 49 namespace extensions {
46 class InfoMap; 50 class InfoMap;
47 } 51 }
48 52
49 namespace net { 53 namespace net {
50 class CertVerifier; 54 class CertVerifier;
51 class ChannelIDService; 55 class ChannelIDService;
52 class CookieStore; 56 class CookieStore;
53 class FraudulentCertificateReporter; 57 class FraudulentCertificateReporter;
54 class FtpTransactionFactory; 58 class FtpTransactionFactory;
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 Profile::ProfileType profile_type() const { 230 Profile::ProfileType profile_type() const {
227 return profile_type_; 231 return profile_type_;
228 } 232 }
229 233
230 bool IsOffTheRecord() const; 234 bool IsOffTheRecord() const;
231 235
232 IntegerPrefMember* incognito_availibility() const { 236 IntegerPrefMember* incognito_availibility() const {
233 return &incognito_availibility_pref_; 237 return &incognito_availibility_pref_;
234 } 238 }
235 239
240 chrome_browser_net::ResourcePrefetchPredictorObserver*
241 resource_prefetch_predictor_observer() const {
242 return resource_prefetch_predictor_observer_.get();
243 }
244
236 #if defined(ENABLE_CONFIGURATION_POLICY) 245 #if defined(ENABLE_CONFIGURATION_POLICY)
237 policy::PolicyHeaderIOHelper* policy_header_helper() const { 246 policy::PolicyHeaderIOHelper* policy_header_helper() const {
238 return policy_header_helper_.get(); 247 return policy_header_helper_.get();
239 } 248 }
240 #endif 249 #endif
241 250
242 #if defined(ENABLE_MANAGED_USERS) 251 #if defined(ENABLE_MANAGED_USERS)
243 const SupervisedUserURLFilter* supervised_user_url_filter() const { 252 const SupervisedUserURLFilter* supervised_user_url_filter() const {
244 return supervised_user_url_filter_.get(); 253 return supervised_user_url_filter_.get();
245 } 254 }
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 317
309 base::FilePath path; 318 base::FilePath path;
310 IOThread* io_thread; 319 IOThread* io_thread;
311 scoped_refptr<CookieSettings> cookie_settings; 320 scoped_refptr<CookieSettings> cookie_settings;
312 scoped_refptr<HostContentSettingsMap> host_content_settings_map; 321 scoped_refptr<HostContentSettingsMap> host_content_settings_map;
313 scoped_refptr<net::SSLConfigService> ssl_config_service; 322 scoped_refptr<net::SSLConfigService> ssl_config_service;
314 scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate; 323 scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
315 #if defined(ENABLE_EXTENSIONS) 324 #if defined(ENABLE_EXTENSIONS)
316 scoped_refptr<extensions::InfoMap> extension_info_map; 325 scoped_refptr<extensions::InfoMap> extension_info_map;
317 #endif 326 #endif
327 scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver>
328 resource_prefetch_predictor_observer_;
Lei Zhang 2014/09/09 03:32:20 nit: indent 4 spaces
Zhen Wang 2014/09/13 00:36:33 Done.
318 329
319 // This pointer exists only as a means of conveying a url job factory 330 // This pointer exists only as a means of conveying a url job factory
320 // pointer from the protocol handler registry on the UI thread to the 331 // pointer from the protocol handler registry on the UI thread to the
321 // the URLRequestContext on the IO thread. The consumer MUST take 332 // the URLRequestContext on the IO thread. The consumer MUST take
322 // ownership of the object by calling release() on this pointer. 333 // ownership of the object by calling release() on this pointer.
323 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> 334 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
324 protocol_handler_interceptor; 335 protocol_handler_interceptor;
325 336
326 // We need to initialize the ProxyConfigService from the UI thread 337 // We need to initialize the ProxyConfigService from the UI thread
327 // because on linux it relies on initializing things through gconf, 338 // because on linux it relies on initializing things through gconf,
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 // One URLRequestContext per isolated app for main and media requests. 617 // One URLRequestContext per isolated app for main and media requests.
607 mutable URLRequestContextMap app_request_context_map_; 618 mutable URLRequestContextMap app_request_context_map_;
608 mutable URLRequestContextMap isolated_media_request_context_map_; 619 mutable URLRequestContextMap isolated_media_request_context_map_;
609 620
610 mutable scoped_ptr<ResourceContext> resource_context_; 621 mutable scoped_ptr<ResourceContext> resource_context_;
611 622
612 mutable scoped_refptr<CookieSettings> cookie_settings_; 623 mutable scoped_refptr<CookieSettings> cookie_settings_;
613 624
614 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 625 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
615 626
627 mutable scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver>
628 resource_prefetch_predictor_observer_;
629
616 mutable scoped_ptr<ChromeHttpUserAgentSettings> 630 mutable scoped_ptr<ChromeHttpUserAgentSettings>
617 chrome_http_user_agent_settings_; 631 chrome_http_user_agent_settings_;
618 632
619 #if defined(ENABLE_MANAGED_USERS) 633 #if defined(ENABLE_MANAGED_USERS)
620 mutable scoped_refptr<const SupervisedUserURLFilter> 634 mutable scoped_refptr<const SupervisedUserURLFilter>
621 supervised_user_url_filter_; 635 supervised_user_url_filter_;
622 #endif 636 #endif
623 637
624 mutable scoped_ptr<DevToolsNetworkController> network_controller_; 638 mutable scoped_ptr<DevToolsNetworkController> network_controller_;
625 639
626 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 640 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
627 bool initialized_on_UI_thread_; 641 bool initialized_on_UI_thread_;
628 642
629 const Profile::ProfileType profile_type_; 643 const Profile::ProfileType profile_type_;
630 644
631 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 645 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
632 }; 646 };
633 647
634 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 648 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698