diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 14:16:28 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 14:16:28 +0000 |
| commit | 9e091d3f94429d705832298783feddfc7bd9e0c5 (patch) | |
| tree | 575d7be8a4f6fb1e1dbbb8583f819b2ccd9ebda9 /chrome/browser/chromeos/proxy_config_service_impl.cc | |
| parent | 98355a74afcd284db8ba7cb85c460dd87209db22 (diff) | |
| download | chromium_src-9e091d3f94429d705832298783feddfc7bd9e0c5.zip chromium_src-9e091d3f94429d705832298783feddfc7bd9e0c5.tar.gz chromium_src-9e091d3f94429d705832298783feddfc7bd9e0c5.tar.bz2 | |
Move policy protocol buffer definitions next to code that needs them.
Remove the chrome/browser/policy/proto directory and move the contents
to chrome/browser/policy/cloud/proto and
chrome/browser/chromeos/policy/proto, respectively. Split the gyp rules
to reflect that structure so unneeded protos are not compiled on
configurations that don't need them.
BUG=None
TEST=Compiles and passes tests.
Review URL: https://codereview.chromium.org/12231003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/proxy_config_service_impl.cc')
| -rw-r--r-- | chrome/browser/chromeos/proxy_config_service_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc index 913bbd8..fc27fc1 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc @@ -14,9 +14,9 @@ #include "base/string_util.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/login/user_manager.h" +#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings_names.h" -#include "chrome/browser/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/browser/prefs/proxy_prefs.h" #include "chrome/browser/profiles/profile_manager.h" |