diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-22 04:05:07 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-22 04:05:07 +0000 |
| commit | 99e652fd299533d45c199f694f7b4d5f4d22d69c (patch) | |
| tree | 49bf91a1aaf8ec47a72f4550cfb0d78aa624dabf /chrome/browser/policy | |
| parent | a1595312b958e430d54f55b7d93319d52da27d93 (diff) | |
| download | chromium_src-99e652fd299533d45c199f694f7b4d5f4d22d69c.zip chromium_src-99e652fd299533d45c199f694f7b4d5f4d22d69c.tar.gz chromium_src-99e652fd299533d45c199f694f7b4d5f4d22d69c.tar.bz2 | |
"Recommit 118589 - Re-commit r117965 and 117130 with a fix for perf regression."
This reverts commit 51e62c2c61ecde08d0e7cca563624184f634953f.
BUG=108017
TEST=none
TBR=tim@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9138051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
| -rw-r--r-- | chrome/browser/policy/browser_policy_connector.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc index e94f0d6..4324ac6 100644 --- a/chrome/browser/policy/browser_policy_connector.cc +++ b/chrome/browser/policy/browser_policy_connector.cc @@ -9,8 +9,6 @@ #include "base/file_path.h" #include "base/path_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/net/gaia/token_service.h" -#include "chrome/browser/policy/cloud_policy_data_store.h" #include "chrome/browser/policy/cloud_policy_provider.h" #include "chrome/browser/policy/cloud_policy_provider_impl.h" #include "chrome/browser/policy/cloud_policy_subsystem.h" @@ -18,6 +16,7 @@ #include "chrome/browser/policy/network_configuration_updater.h" #include "chrome/browser/policy/user_policy_cache.h" #include "chrome/browser/policy/user_policy_token_cache.h" +#include "chrome/browser/signin/token_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" |