diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 11:31:31 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 11:31:31 +0000 |
| commit | edaf596da7f67917f53891fabbeffad00db5f843 (patch) | |
| tree | 0b7fd8e3f8a100dfd5daa6a39f17840c589e21e5 /chrome/browser/chromeos/proxy_config_service_impl.cc | |
| parent | d1d877d6ee940ddd2bd062a2126478a013161bba (diff) | |
| download | chromium_src-edaf596da7f67917f53891fabbeffad00db5f843.zip chromium_src-edaf596da7f67917f53891fabbeffad00db5f843.tar.gz chromium_src-edaf596da7f67917f53891fabbeffad00db5f843.tar.bz2 | |
Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.
BUG=chromium:139126
TEST=Still compiles and passes tests, no functional changes.
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10824112
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149399 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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc index e93ac38..4d24df5 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc @@ -12,9 +12,9 @@ #include "base/string_util.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/onc_constants.h" -#include "chrome/browser/chromeos/cros_settings.h" -#include "chrome/browser/chromeos/cros_settings_names.h" #include "chrome/browser/chromeos/login/user_manager.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/pref_service.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" |