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

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: rebase to fix patch failure 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 Profile::ProfileType profile_type() const { 225 Profile::ProfileType profile_type() const {
222 return profile_type_; 226 return profile_type_;
223 } 227 }
224 228
225 bool IsOffTheRecord() const; 229 bool IsOffTheRecord() const;
226 230
227 IntegerPrefMember* incognito_availibility() const { 231 IntegerPrefMember* incognito_availibility() const {
228 return &incognito_availibility_pref_; 232 return &incognito_availibility_pref_;
229 } 233 }
230 234
235 chrome_browser_net::ResourcePrefetchPredictorObserver*
236 resource_prefetch_predictor_observer() const {
237 return resource_prefetch_predictor_observer_.get();
238 }
239
231 #if defined(ENABLE_CONFIGURATION_POLICY) 240 #if defined(ENABLE_CONFIGURATION_POLICY)
232 policy::PolicyHeaderIOHelper* policy_header_helper() const { 241 policy::PolicyHeaderIOHelper* policy_header_helper() const {
233 return policy_header_helper_.get(); 242 return policy_header_helper_.get();
234 } 243 }
235 #endif 244 #endif
236 245
237 #if defined(ENABLE_MANAGED_USERS) 246 #if defined(ENABLE_MANAGED_USERS)
238 const SupervisedUserURLFilter* supervised_user_url_filter() const { 247 const SupervisedUserURLFilter* supervised_user_url_filter() const {
239 return supervised_user_url_filter_.get(); 248 return supervised_user_url_filter_.get();
240 } 249 }
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 312
304 base::FilePath path; 313 base::FilePath path;
305 IOThread* io_thread; 314 IOThread* io_thread;
306 scoped_refptr<CookieSettings> cookie_settings; 315 scoped_refptr<CookieSettings> cookie_settings;
307 scoped_refptr<HostContentSettingsMap> host_content_settings_map; 316 scoped_refptr<HostContentSettingsMap> host_content_settings_map;
308 scoped_refptr<net::SSLConfigService> ssl_config_service; 317 scoped_refptr<net::SSLConfigService> ssl_config_service;
309 scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate; 318 scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
310 #if defined(ENABLE_EXTENSIONS) 319 #if defined(ENABLE_EXTENSIONS)
311 scoped_refptr<extensions::InfoMap> extension_info_map; 320 scoped_refptr<extensions::InfoMap> extension_info_map;
312 #endif 321 #endif
322 scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver>
323 resource_prefetch_predictor_observer_;
313 324
314 // This pointer exists only as a means of conveying a url job factory 325 // This pointer exists only as a means of conveying a url job factory
315 // pointer from the protocol handler registry on the UI thread to the 326 // pointer from the protocol handler registry on the UI thread to the
316 // the URLRequestContext on the IO thread. The consumer MUST take 327 // the URLRequestContext on the IO thread. The consumer MUST take
317 // ownership of the object by calling release() on this pointer. 328 // ownership of the object by calling release() on this pointer.
318 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> 329 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
319 protocol_handler_interceptor; 330 protocol_handler_interceptor;
320 331
321 // We need to initialize the ProxyConfigService from the UI thread 332 // We need to initialize the ProxyConfigService from the UI thread
322 // because on linux it relies on initializing things through gconf, 333 // because on linux it relies on initializing things through gconf,
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 // One URLRequestContext per isolated app for main and media requests. 605 // One URLRequestContext per isolated app for main and media requests.
595 mutable URLRequestContextMap app_request_context_map_; 606 mutable URLRequestContextMap app_request_context_map_;
596 mutable URLRequestContextMap isolated_media_request_context_map_; 607 mutable URLRequestContextMap isolated_media_request_context_map_;
597 608
598 mutable scoped_ptr<ResourceContext> resource_context_; 609 mutable scoped_ptr<ResourceContext> resource_context_;
599 610
600 mutable scoped_refptr<CookieSettings> cookie_settings_; 611 mutable scoped_refptr<CookieSettings> cookie_settings_;
601 612
602 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 613 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
603 614
615 mutable scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver>
616 resource_prefetch_predictor_observer_;
617
604 mutable scoped_ptr<ChromeHttpUserAgentSettings> 618 mutable scoped_ptr<ChromeHttpUserAgentSettings>
605 chrome_http_user_agent_settings_; 619 chrome_http_user_agent_settings_;
606 620
607 #if defined(ENABLE_MANAGED_USERS) 621 #if defined(ENABLE_MANAGED_USERS)
608 mutable scoped_refptr<const SupervisedUserURLFilter> 622 mutable scoped_refptr<const SupervisedUserURLFilter>
609 supervised_user_url_filter_; 623 supervised_user_url_filter_;
610 #endif 624 #endif
611 625
612 mutable scoped_ptr<DevToolsNetworkController> network_controller_; 626 mutable scoped_ptr<DevToolsNetworkController> network_controller_;
613 627
614 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 628 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
615 bool initialized_on_UI_thread_; 629 bool initialized_on_UI_thread_;
616 630
617 const Profile::ProfileType profile_type_; 631 const Profile::ProfileType profile_type_;
618 632
619 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 633 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
620 }; 634 };
621 635
622 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 636 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698