Chromium Code Reviews| Index: chrome/browser/profiles/profile_io_data.cc |
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc |
| index e50779ce5fb9da6df15836c34fc522493e7cec96..c3364c2987471ee92607d0e9c8a614c28e581dcf 100644 |
| --- a/chrome/browser/profiles/profile_io_data.cc |
| +++ b/chrome/browser/profiles/profile_io_data.cc |
| @@ -45,6 +45,12 @@ |
| #include "chrome/browser/net/load_time_stats.h" |
| #include "chrome/browser/net/proxy_service_factory.h" |
| #include "chrome/browser/net/resource_prefetch_predictor_observer.h" |
| +#if defined(ENABLE_CONFIGURATION_POLICY) |
| +#include "chrome/browser/policy/cloud/policy_header_service.h" |
| +#include "chrome/browser/policy/cloud/policy_header_service_factory.h" |
| +#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h" |
| +#include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" |
| +#endif |
|
Joao da Silva
2013/12/10 08:34:22
Move this block below, after the unconditional #in
Andrew T Wilson (Slow)
2013/12/10 20:04:57
Done.
|
| #include "chrome/browser/policy/url_blacklist_manager.h" |
| #include "chrome/browser/predictors/resource_prefetch_predictor.h" |
| #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" |
| @@ -55,6 +61,9 @@ |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/pref_names.h" |
| #include "chrome/common/url_constants.h" |
| +#if defined(ENABLE_CONFIGURATION_POLICY) |
| +#include "components/policy/core/browser/policy_header_io_helper.h" |
| +#endif |
|
Joao da Silva
2013/12/10 08:34:22
ditto
Andrew T Wilson (Slow)
2013/12/10 20:04:57
Done.
|
| #include "components/startup_metric_utils/startup_metric_utils.h" |
| #include "content/public/browser/browser_thread.h" |
| #include "content/public/browser/host_zoom_map.h" |
| @@ -470,6 +479,16 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) { |
| // in particular when this ProfileIOData isn't |initialized_| during deletion. |
| #if defined(ENABLE_CONFIGURATION_POLICY) |
| url_blacklist_manager_.reset(new policy::URLBlacklistManager(pref_service)); |
| + |
| + if (!is_incognito()) { |
| + // Add policy headers for non-incognito requests. |
| + policy::PolicyHeaderService* policy_header_service = |
| + policy::PolicyHeaderServiceFactory::GetForBrowserContext(profile); |
| + if (policy_header_service) { |
| + policy_header_helper_ = policy_header_service->CreatePolicyHeaderIOHelper( |
| + io_message_loop_proxy).Pass(); |
| + } |
| + } |
| #endif |
| initialized_on_UI_thread_ = true; |