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/policy | |
| 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/policy')
6 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/policy/app_pack_updater.cc b/chrome/browser/policy/app_pack_updater.cc index 472fc09..20d5f20 100644 --- a/chrome/browser/policy/app_pack_updater.cc +++ b/chrome/browser/policy/app_pack_updater.cc @@ -13,8 +13,8 @@ #include "base/values.h" #include "base/version.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/chromeos/cros_settings.h" -#include "chrome/browser/chromeos/cros_settings_names.h" +#include "chrome/browser/chromeos/settings/cros_settings.h" +#include "chrome/browser/chromeos/settings/cros_settings_names.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/external_loader.h" #include "chrome/browser/extensions/external_provider_impl.h" diff --git a/chrome/browser/policy/device_policy_cache.cc b/chrome/browser/policy/device_policy_cache.cc index c49c508..1cf962d 100644 --- a/chrome/browser/policy/device_policy_cache.cc +++ b/chrome/browser/policy/device_policy_cache.cc @@ -15,9 +15,9 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/values.h" -#include "chrome/browser/chromeos/cros_settings.h" -#include "chrome/browser/chromeos/login/ownership_service.h" -#include "chrome/browser/chromeos/login/signed_settings_helper.h" +#include "chrome/browser/chromeos/settings/cros_settings.h" +#include "chrome/browser/chromeos/settings/ownership_service.h" +#include "chrome/browser/chromeos/settings/signed_settings_helper.h" #include "chrome/browser/policy/app_pack_updater.h" #include "chrome/browser/policy/cloud_policy_data_store.h" #include "chrome/browser/policy/enterprise_install_attributes.h" diff --git a/chrome/browser/policy/device_policy_cache.h b/chrome/browser/policy/device_policy_cache.h index f6c5b4a..573a514 100644 --- a/chrome/browser/policy/device_policy_cache.h +++ b/chrome/browser/policy/device_policy_cache.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_POLICY_DEVICE_POLICY_CACHE_H_ #include "base/memory/weak_ptr.h" -#include "chrome/browser/chromeos/login/signed_settings.h" +#include "chrome/browser/chromeos/settings/signed_settings.h" #include "chrome/browser/policy/cloud_policy_cache_base.h" namespace chromeos { diff --git a/chrome/browser/policy/device_policy_cache_unittest.cc b/chrome/browser/policy/device_policy_cache_unittest.cc index 5d7b54f..4762ab4 100644 --- a/chrome/browser/policy/device_policy_cache_unittest.cc +++ b/chrome/browser/policy/device_policy_cache_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/policy/device_policy_cache.h" #include "chrome/browser/chromeos/cros/cryptohome_library.h" -#include "chrome/browser/chromeos/login/mock_signed_settings_helper.h" +#include "chrome/browser/chromeos/settings/mock_signed_settings_helper.h" #include "chrome/browser/policy/cloud_policy_data_store.h" #include "chrome/browser/policy/enterprise_install_attributes.h" #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" diff --git a/chrome/browser/policy/device_status_collector.cc b/chrome/browser/policy/device_status_collector.cc index ab50efa80..dae4556 100644 --- a/chrome/browser/policy/device_status_collector.cc +++ b/chrome/browser/policy/device_status_collector.cc @@ -11,8 +11,8 @@ #include "base/memory/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/values.h" -#include "chrome/browser/chromeos/cros_settings.h" -#include "chrome/browser/chromeos/cros_settings_names.h" +#include "chrome/browser/chromeos/settings/cros_settings.h" +#include "chrome/browser/chromeos/settings/cros_settings_names.h" #include "chrome/browser/chromeos/system/statistics_provider.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/policy/device_status_collector_unittest.cc b/chrome/browser/policy/device_status_collector_unittest.cc index ec764b2..a5a4b1d 100644 --- a/chrome/browser/policy/device_status_collector_unittest.cc +++ b/chrome/browser/policy/device_status_collector_unittest.cc @@ -7,10 +7,10 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "chrome/browser/chromeos/cros_settings.h" -#include "chrome/browser/chromeos/cros_settings_names.h" -#include "chrome/browser/chromeos/cros_settings_provider.h" -#include "chrome/browser/chromeos/stub_cros_settings_provider.h" +#include "chrome/browser/chromeos/settings/cros_settings.h" +#include "chrome/browser/chromeos/settings/cros_settings_names.h" +#include "chrome/browser/chromeos/settings/cros_settings_provider.h" +#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" #include "chrome/browser/chromeos/system/mock_statistics_provider.h" #include "chrome/browser/chromeos/system/statistics_provider.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" |