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..abccc232352200fce69e99ce2502c45015ccf7a2 100644 |
| --- a/chrome/browser/profiles/profile_io_data.cc |
| +++ b/chrome/browser/profiles/profile_io_data.cc |
| @@ -81,6 +81,14 @@ |
| #include "net/url_request/url_request_file_job.h" |
| #include "net/url_request/url_request_job_factory_impl.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" |
| +#include "components/policy/core/browser/policy_header_io_helper.h" |
| +#endif |
| + |
| #if defined(ENABLE_MANAGED_USERS) |
| #include "chrome/browser/managed_mode/managed_mode_url_filter.h" |
| #include "chrome/browser/managed_mode/managed_user_service.h" |
| @@ -470,6 +478,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(); |
|
willchan no longer on Chromium
2013/12/10 23:27:09
I don't think you need the .Pass() here, do you?
Andrew T Wilson (Slow)
2013/12/10 23:53:06
Removed.
|
| + } |
| + } |
| #endif |
| initialized_on_UI_thread_ = true; |