| Index: chrome/browser/profiles/profile_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
|
| index 34fdecb6a916af5746004febe8686471c87e77fc..a09f1f4b7b5e53c9ec8dab4da400d124fd811b89 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -30,6 +30,7 @@ class CookieSettings;
|
| class DesktopNotificationService;
|
| class ExtensionInfoMap;
|
| class HostContentSettingsMap;
|
| +class ManagedModeURLFilter;
|
| class Profile;
|
| class ProtocolHandlerRegistry;
|
| class SigninNamesOnIOThread;
|
| @@ -154,6 +155,12 @@ class ProfileIOData {
|
| return resource_prefetch_predictor_observer_.get();
|
| }
|
|
|
| +#if !defined(OS_ANDROID)
|
| + const ManagedModeURLFilter* managed_mode_url_filter() const {
|
| + return managed_mode_url_filter_.get();
|
| + }
|
| +#endif
|
| +
|
| // Initialize the member needed to track the metrics enabled state. This is
|
| // only to be called on the UI thread.
|
| void InitializeMetricsEnabledStateOnUIThread();
|
| @@ -230,6 +237,11 @@ class ProfileIOData {
|
| // because on linux it relies on initializing things through gconf,
|
| // and needs to be on the main thread.
|
| scoped_ptr<net::ProxyConfigService> proxy_config_service;
|
| +
|
| +#if !defined(OS_ANDROID)
|
| + scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter;
|
| +#endif
|
| +
|
| // The profile this struct was populated from. It's passed as a void* to
|
| // ensure it's not accidently used on the IO thread. Before using it on the
|
| // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
|
| @@ -470,6 +482,10 @@ class ProfileIOData {
|
|
|
| mutable chrome_browser_net::LoadTimeStats* load_time_stats_;
|
|
|
| +#if !defined(OS_ANDROID)
|
| + mutable scoped_refptr<const ManagedModeURLFilter> managed_mode_url_filter_;
|
| +#endif
|
| +
|
| // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
|
| bool initialized_on_UI_thread_;
|
|
|
|
|