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

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

Issue 2776493005: Convert SupervisedUserResourceThrottle to a NavigationThrottle. (Closed)
Patch Set: Response to comments Created 3 years, 8 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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 28 matching lines...) Expand all
39 #include "net/url_request/url_request_job_factory.h" 39 #include "net/url_request/url_request_job_factory.h"
40 40
41 class ChromeHttpUserAgentSettings; 41 class ChromeHttpUserAgentSettings;
42 class ChromeNetworkDelegate; 42 class ChromeNetworkDelegate;
43 class ChromeURLRequestContextGetter; 43 class ChromeURLRequestContextGetter;
44 class ChromeExpectCTReporter; 44 class ChromeExpectCTReporter;
45 class HostContentSettingsMap; 45 class HostContentSettingsMap;
46 class MediaDeviceIDSalt; 46 class MediaDeviceIDSalt;
47 class NetHttpSessionParamsObserver; 47 class NetHttpSessionParamsObserver;
48 class ProtocolHandlerRegistry; 48 class ProtocolHandlerRegistry;
49 class SupervisedUserURLFilter;
50 49
51 namespace chromeos { 50 namespace chromeos {
52 class CertificateProvider; 51 class CertificateProvider;
53 } 52 }
54 53
55 namespace chrome_browser_net { 54 namespace chrome_browser_net {
56 class ResourcePrefetchPredictorObserver; 55 class ResourcePrefetchPredictorObserver;
57 } 56 }
58 57
59 namespace certificate_transparency { 58 namespace certificate_transparency {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 212
214 chrome_browser_net::ResourcePrefetchPredictorObserver* 213 chrome_browser_net::ResourcePrefetchPredictorObserver*
215 resource_prefetch_predictor_observer() const { 214 resource_prefetch_predictor_observer() const {
216 return resource_prefetch_predictor_observer_.get(); 215 return resource_prefetch_predictor_observer_.get();
217 } 216 }
218 217
219 policy::PolicyHeaderIOHelper* policy_header_helper() const { 218 policy::PolicyHeaderIOHelper* policy_header_helper() const {
220 return policy_header_helper_.get(); 219 return policy_header_helper_.get();
221 } 220 }
222 221
223 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
224 const SupervisedUserURLFilter* supervised_user_url_filter() const {
225 return supervised_user_url_filter_.get();
226 }
227 #endif
228
229 // Initialize the member needed to track the metrics enabled state. This is 222 // Initialize the member needed to track the metrics enabled state. This is
230 // only to be called on the UI thread. 223 // only to be called on the UI thread.
231 void InitializeMetricsEnabledStateOnUIThread(); 224 void InitializeMetricsEnabledStateOnUIThread();
232 225
233 // Returns whether or not metrics reporting is enabled in the browser instance 226 // Returns whether or not metrics reporting is enabled in the browser instance
234 // on which this profile resides. This is safe for use from the IO thread, and 227 // on which this profile resides. This is safe for use from the IO thread, and
235 // should only be called from there. 228 // should only be called from there.
236 bool GetMetricsEnabledStateOnIOThread() const; 229 bool GetMetricsEnabledStateOnIOThread() const;
237 230
238 void set_client_cert_store_factory_for_testing( 231 void set_client_cert_store_factory_for_testing(
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 328
336 // Holds the URLRequestInterceptor pointer that is created on the UI thread 329 // Holds the URLRequestInterceptor pointer that is created on the UI thread
337 // and then passed to the list of request_interceptors on the IO thread. 330 // and then passed to the list of request_interceptors on the IO thread.
338 std::unique_ptr<net::URLRequestInterceptor> new_tab_page_interceptor; 331 std::unique_ptr<net::URLRequestInterceptor> new_tab_page_interceptor;
339 332
340 // We need to initialize the ProxyConfigService from the UI thread 333 // We need to initialize the ProxyConfigService from the UI thread
341 // because on linux it relies on initializing things through gconf, 334 // because on linux it relies on initializing things through gconf,
342 // and needs to be on the main thread. 335 // and needs to be on the main thread.
343 std::unique_ptr<net::ProxyConfigService> proxy_config_service; 336 std::unique_ptr<net::ProxyConfigService> proxy_config_service;
344 337
345 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
346 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter;
347 #endif
348
349 #if defined(OS_CHROMEOS) 338 #if defined(OS_CHROMEOS)
350 std::string username_hash; 339 std::string username_hash;
351 bool use_system_key_slot; 340 bool use_system_key_slot;
352 std::unique_ptr<chromeos::CertificateProvider> certificate_provider; 341 std::unique_ptr<chromeos::CertificateProvider> certificate_provider;
353 #endif 342 #endif
354 343
355 // The profile this struct was populated from. It's passed as a void* to 344 // The profile this struct was populated from. It's passed as a void* to
356 // ensure it's not accidently used on the IO thread. Before using it on the 345 // ensure it's not accidently used on the IO thread. Before using it on the
357 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. 346 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
358 void* profile; 347 void* profile;
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 mutable scoped_refptr<content_settings::CookieSettings> cookie_settings_; 599 mutable scoped_refptr<content_settings::CookieSettings> cookie_settings_;
611 600
612 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 601 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
613 602
614 mutable std::unique_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver> 603 mutable std::unique_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver>
615 resource_prefetch_predictor_observer_; 604 resource_prefetch_predictor_observer_;
616 605
617 mutable std::unique_ptr<ChromeHttpUserAgentSettings> 606 mutable std::unique_ptr<ChromeHttpUserAgentSettings>
618 chrome_http_user_agent_settings_; 607 chrome_http_user_agent_settings_;
619 608
620 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
621 mutable scoped_refptr<const SupervisedUserURLFilter>
622 supervised_user_url_filter_;
623 #endif
624
625 #if BUILDFLAG(ENABLE_EXTENSIONS) 609 #if BUILDFLAG(ENABLE_EXTENSIONS)
626 // Is NULL if switches::kDisableExtensionsHttpThrottling is on. 610 // Is NULL if switches::kDisableExtensionsHttpThrottling is on.
627 mutable std::unique_ptr<extensions::ExtensionThrottleManager> 611 mutable std::unique_ptr<extensions::ExtensionThrottleManager>
628 extension_throttle_manager_; 612 extension_throttle_manager_;
629 #endif 613 #endif
630 614
631 mutable DevToolsNetworkControllerHandle network_controller_handle_; 615 mutable DevToolsNetworkControllerHandle network_controller_handle_;
632 616
633 mutable std::unique_ptr<certificate_transparency::TreeStateTracker> 617 mutable std::unique_ptr<certificate_transparency::TreeStateTracker>
634 ct_tree_tracker_; 618 ct_tree_tracker_;
635 mutable base::Closure ct_tree_tracker_unregistration_; 619 mutable base::Closure ct_tree_tracker_unregistration_;
636 620
637 const Profile::ProfileType profile_type_; 621 const Profile::ProfileType profile_type_;
638 622
639 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 623 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
640 }; 624 };
641 625
642 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 626 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698