| 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 <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "net/cookies/cookie_monster.h" | 26 #include "net/cookies/cookie_monster.h" |
| 27 #include "net/http/http_cache.h" | 27 #include "net/http/http_cache.h" |
| 28 #include "net/http/http_network_session.h" | 28 #include "net/http/http_network_session.h" |
| 29 #include "net/url_request/url_request_job_factory.h" | 29 #include "net/url_request/url_request_job_factory.h" |
| 30 | 30 |
| 31 class ChromeHttpUserAgentSettings; | 31 class ChromeHttpUserAgentSettings; |
| 32 class ChromeNetworkDelegate; | 32 class ChromeNetworkDelegate; |
| 33 class CookieSettings; | 33 class CookieSettings; |
| 34 class DevToolsNetworkController; | 34 class DevToolsNetworkController; |
| 35 class HostContentSettingsMap; | 35 class HostContentSettingsMap; |
| 36 class ManagedModeURLFilter; | |
| 37 class MediaDeviceIDSalt; | 36 class MediaDeviceIDSalt; |
| 38 class ProtocolHandlerRegistry; | 37 class ProtocolHandlerRegistry; |
| 39 class SigninNamesOnIOThread; | 38 class SigninNamesOnIOThread; |
| 39 class SupervisedUserURLFilter; |
| 40 | 40 |
| 41 namespace extensions { | 41 namespace extensions { |
| 42 class InfoMap; | 42 class InfoMap; |
| 43 } | 43 } |
| 44 | 44 |
| 45 namespace net { | 45 namespace net { |
| 46 class CookieStore; | 46 class CookieStore; |
| 47 class FraudulentCertificateReporter; | 47 class FraudulentCertificateReporter; |
| 48 class FtpTransactionFactory; | 48 class FtpTransactionFactory; |
| 49 class HttpServerProperties; | 49 class HttpServerProperties; |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 return &incognito_availibility_pref_; | 214 return &incognito_availibility_pref_; |
| 215 } | 215 } |
| 216 | 216 |
| 217 #if defined(ENABLE_CONFIGURATION_POLICY) | 217 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 218 policy::PolicyHeaderIOHelper* policy_header_helper() const { | 218 policy::PolicyHeaderIOHelper* policy_header_helper() const { |
| 219 return policy_header_helper_.get(); | 219 return policy_header_helper_.get(); |
| 220 } | 220 } |
| 221 #endif | 221 #endif |
| 222 | 222 |
| 223 #if defined(ENABLE_MANAGED_USERS) | 223 #if defined(ENABLE_MANAGED_USERS) |
| 224 const ManagedModeURLFilter* managed_mode_url_filter() const { | 224 const SupervisedUserURLFilter* supervised_user_url_filter() const { |
| 225 return managed_mode_url_filter_.get(); | 225 return supervised_user_url_filter_.get(); |
| 226 } | 226 } |
| 227 #endif | 227 #endif |
| 228 | 228 |
| 229 // Initialize the member needed to track the metrics enabled state. This is | 229 // Initialize the member needed to track the metrics enabled state. This is |
| 230 // only to be called on the UI thread. | 230 // only to be called on the UI thread. |
| 231 void InitializeMetricsEnabledStateOnUIThread(); | 231 void InitializeMetricsEnabledStateOnUIThread(); |
| 232 | 232 |
| 233 // Returns whether or not metrics reporting is enabled in the browser instance | 233 // 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 | 234 // on which this profile resides. This is safe for use from the IO thread, and |
| 235 // should only be called from there. | 235 // should only be called from there. |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 // ownership of the object by calling release() on this pointer. | 295 // ownership of the object by calling release() on this pointer. |
| 296 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> | 296 scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> |
| 297 protocol_handler_interceptor; | 297 protocol_handler_interceptor; |
| 298 | 298 |
| 299 // We need to initialize the ProxyConfigService from the UI thread | 299 // We need to initialize the ProxyConfigService from the UI thread |
| 300 // because on linux it relies on initializing things through gconf, | 300 // because on linux it relies on initializing things through gconf, |
| 301 // and needs to be on the main thread. | 301 // and needs to be on the main thread. |
| 302 scoped_ptr<net::ProxyConfigService> proxy_config_service; | 302 scoped_ptr<net::ProxyConfigService> proxy_config_service; |
| 303 | 303 |
| 304 #if defined(ENABLE_MANAGED_USERS) | 304 #if defined(ENABLE_MANAGED_USERS) |
| 305 scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter; | 305 scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter; |
| 306 #endif | 306 #endif |
| 307 | 307 |
| 308 #if defined(OS_CHROMEOS) | 308 #if defined(OS_CHROMEOS) |
| 309 std::string username_hash; | 309 std::string username_hash; |
| 310 #endif | 310 #endif |
| 311 | 311 |
| 312 // The profile this struct was populated from. It's passed as a void* to | 312 // The profile this struct was populated from. It's passed as a void* to |
| 313 // ensure it's not accidently used on the IO thread. Before using it on the | 313 // ensure it's not accidently used on the IO thread. Before using it on the |
| 314 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. | 314 // UI thread, call ProfileManager::IsValidProfile to ensure it's alive. |
| 315 void* profile; | 315 void* profile; |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 572 mutable scoped_ptr<ResourceContext> resource_context_; | 572 mutable scoped_ptr<ResourceContext> resource_context_; |
| 573 | 573 |
| 574 mutable scoped_refptr<CookieSettings> cookie_settings_; | 574 mutable scoped_refptr<CookieSettings> cookie_settings_; |
| 575 | 575 |
| 576 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_; | 576 mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_; |
| 577 | 577 |
| 578 mutable scoped_ptr<ChromeHttpUserAgentSettings> | 578 mutable scoped_ptr<ChromeHttpUserAgentSettings> |
| 579 chrome_http_user_agent_settings_; | 579 chrome_http_user_agent_settings_; |
| 580 | 580 |
| 581 #if defined(ENABLE_MANAGED_USERS) | 581 #if defined(ENABLE_MANAGED_USERS) |
| 582 mutable scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter_; | 582 mutable scoped_refptr<const SupervisedUserURLFilter> |
| 583 supervised_user_url_filter_; |
| 583 #endif | 584 #endif |
| 584 | 585 |
| 585 mutable scoped_ptr<DevToolsNetworkController> network_controller_; | 586 mutable scoped_ptr<DevToolsNetworkController> network_controller_; |
| 586 | 587 |
| 587 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 588 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
| 588 bool initialized_on_UI_thread_; | 589 bool initialized_on_UI_thread_; |
| 589 | 590 |
| 590 const Profile::ProfileType profile_type_; | 591 const Profile::ProfileType profile_type_; |
| 591 | 592 |
| 592 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 593 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
| 593 }; | 594 }; |
| 594 | 595 |
| 595 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 596 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
| OLD | NEW |