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

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

Issue 684223003: Data Reduction Proxy Interstitials (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing bengr comments Created 5 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
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 17 matching lines...) Expand all
28 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usag e_stats.h" 28 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usag e_stats.h"
29 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event _store.h" 29 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event _store.h"
30 #include "content/public/browser/content_browser_client.h" 30 #include "content/public/browser/content_browser_client.h"
31 #include "content/public/browser/resource_context.h" 31 #include "content/public/browser/resource_context.h"
32 #include "net/cookies/cookie_monster.h" 32 #include "net/cookies/cookie_monster.h"
33 #include "net/http/http_cache.h" 33 #include "net/http/http_cache.h"
34 #include "net/http/http_network_session.h" 34 #include "net/http/http_network_session.h"
35 #include "net/url_request/url_request_context.h" 35 #include "net/url_request/url_request_context.h"
36 #include "net/url_request/url_request_job_factory.h" 36 #include "net/url_request/url_request_job_factory.h"
37 37
38 #if defined(OS_ANDROID)
39 #include "components/data_reduction_proxy/content/browser/data_reduction_proxy_u i_service.h"
40 #endif
41
38 class ChromeHttpUserAgentSettings; 42 class ChromeHttpUserAgentSettings;
39 class ChromeNetworkDelegate; 43 class ChromeNetworkDelegate;
40 class ChromeURLRequestContextGetter; 44 class ChromeURLRequestContextGetter;
41 class CookieSettings; 45 class CookieSettings;
42 class DevToolsNetworkController; 46 class DevToolsNetworkController;
43 class HostContentSettingsMap; 47 class HostContentSettingsMap;
44 class MediaDeviceIDSalt; 48 class MediaDeviceIDSalt;
45 class ProtocolHandlerRegistry; 49 class ProtocolHandlerRegistry;
46 class SigninNamesOnIOThread; 50 class SigninNamesOnIOThread;
47 class SupervisedUserURLFilter; 51 class SupervisedUserURLFilter;
48 52
49 namespace chrome_browser_net { 53 namespace chrome_browser_net {
50 class ResourcePrefetchPredictorObserver; 54 class ResourcePrefetchPredictorObserver;
51 } 55 }
52 56
57 namespace data_reduction_proxy {
58 class DataReductionProxyParams;
59 }
60
53 namespace extensions { 61 namespace extensions {
54 class InfoMap; 62 class InfoMap;
55 } 63 }
56 64
57 namespace net { 65 namespace net {
58 class CertVerifier; 66 class CertVerifier;
59 class ChannelIDService; 67 class ChannelIDService;
60 class CookieStore; 68 class CookieStore;
61 class FraudulentCertificateReporter; 69 class FraudulentCertificateReporter;
62 class FtpTransactionFactory; 70 class FtpTransactionFactory;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const; 211 content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const;
204 212
205 DevToolsNetworkController* network_controller() const { 213 DevToolsNetworkController* network_controller() const {
206 return network_controller_.get(); 214 return network_controller_.get();
207 } 215 }
208 216
209 net::TransportSecurityState* transport_security_state() const { 217 net::TransportSecurityState* transport_security_state() const {
210 return transport_security_state_.get(); 218 return transport_security_state_.get();
211 } 219 }
212 220
221 data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params()
222 const {
223 return data_reduction_proxy_params_.get();
224 }
225
226 #if defined(OS_ANDROID)
227 data_reduction_proxy::DataReductionProxyUIService*
228 data_reduction_proxy_ui_service() const {
229 return data_reduction_proxy_ui_service_.get();
230 }
231 #endif
232
213 #if defined(OS_CHROMEOS) 233 #if defined(OS_CHROMEOS)
214 std::string username_hash() const { 234 std::string username_hash() const {
215 return username_hash_; 235 return username_hash_;
216 } 236 }
217 237
218 bool use_system_key_slot() const { return use_system_key_slot_; } 238 bool use_system_key_slot() const { return use_system_key_slot_; }
219 #endif 239 #endif
220 240
221 Profile::ProfileType profile_type() const { 241 Profile::ProfileType profile_type() const {
222 return profile_type_; 242 return profile_type_;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 void ShutdownOnUIThread( 384 void ShutdownOnUIThread(
365 scoped_ptr<ChromeURLRequestContextGetterVector> context_getters); 385 scoped_ptr<ChromeURLRequestContextGetterVector> context_getters);
366 386
367 // A ChannelIDService object is created by a derived class of 387 // A ChannelIDService object is created by a derived class of
368 // ProfileIOData, and the derived class calls this method to set the 388 // ProfileIOData, and the derived class calls this method to set the
369 // channel_id_service_ member and transfers ownership to the base 389 // channel_id_service_ member and transfers ownership to the base
370 // class. 390 // class.
371 void set_channel_id_service( 391 void set_channel_id_service(
372 net::ChannelIDService* channel_id_service) const; 392 net::ChannelIDService* channel_id_service) const;
373 393
374 data_reduction_proxy::DataReductionProxyParams* data_reduction_proxy_params()
375 const {
376 return data_reduction_proxy_params_.get();
377 }
378
379 void set_data_reduction_proxy_params( 394 void set_data_reduction_proxy_params(
380 scoped_ptr<data_reduction_proxy::DataReductionProxyParams> 395 scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
381 data_reduction_proxy_params) const { 396 data_reduction_proxy_params) const {
382 data_reduction_proxy_params_ = data_reduction_proxy_params.Pass(); 397 data_reduction_proxy_params_ = data_reduction_proxy_params.Pass();
383 } 398 }
384 399
385 data_reduction_proxy::DataReductionProxyUsageStats* 400 data_reduction_proxy::DataReductionProxyUsageStats*
386 data_reduction_proxy_usage_stats() const { 401 data_reduction_proxy_usage_stats() const {
387 return data_reduction_proxy_usage_stats_.get(); 402 return data_reduction_proxy_usage_stats_.get();
388 } 403 }
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 data_reduction_proxy_auth_request_handler) const { 452 data_reduction_proxy_auth_request_handler) const {
438 data_reduction_proxy_auth_request_handler_ = 453 data_reduction_proxy_auth_request_handler_ =
439 data_reduction_proxy_auth_request_handler.Pass(); 454 data_reduction_proxy_auth_request_handler.Pass();
440 } 455 }
441 456
442 data_reduction_proxy::DataReductionProxyEventStore* 457 data_reduction_proxy::DataReductionProxyEventStore*
443 data_reduction_proxy_event_store() const { 458 data_reduction_proxy_event_store() const {
444 return data_reduction_proxy_event_store_.get(); 459 return data_reduction_proxy_event_store_.get();
445 } 460 }
446 461
462 #if defined(OS_ANDROID)
463 void set_data_reduction_proxy_ui_service(
464 scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>
465 data_reduction_proxy_ui_service) const {
466 data_reduction_proxy_ui_service_ =
467 data_reduction_proxy_ui_service.Pass();
468 }
469 #endif
470
447 void set_data_reduction_proxy_event_store( 471 void set_data_reduction_proxy_event_store(
448 scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore> 472 scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
449 data_reduction_proxy_event_store) const { 473 data_reduction_proxy_event_store) const {
450 data_reduction_proxy_event_store_ = 474 data_reduction_proxy_event_store_ =
451 data_reduction_proxy_event_store.Pass(); 475 data_reduction_proxy_event_store.Pass();
452 } 476 }
453 477
454 net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const { 478 net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
455 return fraudulent_certificate_reporter_.get(); 479 return fraudulent_certificate_reporter_.get();
456 } 480 }
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 data_reduction_proxy_usage_stats_; 684 data_reduction_proxy_usage_stats_;
661 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs> 685 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
662 data_reduction_proxy_statistics_prefs_; 686 data_reduction_proxy_statistics_prefs_;
663 mutable base::Callback<void(bool)> data_reduction_proxy_unavailable_callback_; 687 mutable base::Callback<void(bool)> data_reduction_proxy_unavailable_callback_;
664 mutable scoped_ptr<DataReductionProxyChromeConfigurator> 688 mutable scoped_ptr<DataReductionProxyChromeConfigurator>
665 data_reduction_proxy_chrome_configurator_; 689 data_reduction_proxy_chrome_configurator_;
666 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler> 690 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
667 data_reduction_proxy_auth_request_handler_; 691 data_reduction_proxy_auth_request_handler_;
668 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore> 692 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore>
669 data_reduction_proxy_event_store_; 693 data_reduction_proxy_event_store_;
694 #if defined(OS_ANDROID)
695 // Must be declared after the DataReductionProxyChromeConfigurator, because
696 // the configurator must be valid for the service's entire lifetime.
697 mutable scoped_ptr<data_reduction_proxy::DataReductionProxyUIService>
698 data_reduction_proxy_ui_service_;
699 #endif
670 700
671 mutable scoped_ptr<net::FraudulentCertificateReporter> 701 mutable scoped_ptr<net::FraudulentCertificateReporter>
672 fraudulent_certificate_reporter_; 702 fraudulent_certificate_reporter_;
673 mutable scoped_ptr<net::ProxyService> proxy_service_; 703 mutable scoped_ptr<net::ProxyService> proxy_service_;
674 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_; 704 mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
675 mutable scoped_ptr<net::HttpServerProperties> 705 mutable scoped_ptr<net::HttpServerProperties>
676 http_server_properties_; 706 http_server_properties_;
677 #if defined(OS_CHROMEOS) 707 #if defined(OS_CHROMEOS)
678 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that 708 // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
679 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL. 709 // case, the verifier is owned by |cert_verifier_|. Otherwise, set to NULL.
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 745
716 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 746 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
717 bool initialized_on_UI_thread_; 747 bool initialized_on_UI_thread_;
718 748
719 const Profile::ProfileType profile_type_; 749 const Profile::ProfileType profile_type_;
720 750
721 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 751 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
722 }; 752 };
723 753
724 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 754 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698