Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_provider.cc

Issue 109743002: Move policy code into components/policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moar fixes Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/settings/device_settings_provider.h" 5 #include "chrome/browser/chromeos/settings/device_settings_provider.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/threading/thread_restrictions.h" 16 #include "base/threading/thread_restrictions.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/chromeos/policy/device_local_account.h" 19 #include "chrome/browser/chromeos/policy/device_local_account.h"
20 #include "chrome/browser/chromeos/settings/cros_settings.h" 20 #include "chrome/browser/chromeos/settings/cros_settings.h"
21 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 21 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
22 #include "chrome/browser/policy/browser_policy_connector.h" 22 #include "chrome/browser/policy/browser_policy_connector.h"
23 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
24 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h" 23 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
25 #include "chrome/browser/ui/options/options_util.h" 24 #include "chrome/browser/ui/options/options_util.h"
26 #include "chrome/installer/util/google_update_settings.h" 25 #include "chrome/installer/util/google_update_settings.h"
27 #include "chromeos/chromeos_switches.h" 26 #include "chromeos/chromeos_switches.h"
28 #include "chromeos/network/device_state.h" 27 #include "chromeos/network/device_state.h"
29 #include "chromeos/network/network_device_handler.h" 28 #include "chromeos/network/network_device_handler.h"
30 #include "chromeos/network/network_event_log.h" 29 #include "chromeos/network/network_event_log.h"
31 #include "chromeos/network/network_handler.h" 30 #include "chromeos/network/network_handler.h"
32 #include "chromeos/network/network_state_handler.h" 31 #include "chromeos/network/network_state_handler.h"
33 #include "chromeos/network/shill_property_util.h" 32 #include "chromeos/network/shill_property_util.h"
34 #include "chromeos/settings/cros_settings_names.h" 33 #include "chromeos/settings/cros_settings_names.h"
34 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
35 #include "third_party/cros_system_api/dbus/service_constants.h" 35 #include "third_party/cros_system_api/dbus/service_constants.h"
36 36
37 using google::protobuf::RepeatedField; 37 using google::protobuf::RepeatedField;
38 using google::protobuf::RepeatedPtrField; 38 using google::protobuf::RepeatedPtrField;
39 39
40 namespace em = enterprise_management; 40 namespace em = enterprise_management;
41 41
42 namespace chromeos { 42 namespace chromeos {
43 43
44 namespace { 44 namespace {
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 void DeviceSettingsProvider::AttemptMigration() { 1044 void DeviceSettingsProvider::AttemptMigration() {
1045 if (device_settings_service_->HasPrivateOwnerKey()) { 1045 if (device_settings_service_->HasPrivateOwnerKey()) {
1046 PrefValueMap::const_iterator i; 1046 PrefValueMap::const_iterator i;
1047 for (i = migration_values_.begin(); i != migration_values_.end(); ++i) 1047 for (i = migration_values_.begin(); i != migration_values_.end(); ++i)
1048 DoSet(i->first, *i->second); 1048 DoSet(i->first, *i->second);
1049 migration_values_.Clear(); 1049 migration_values_.Clear();
1050 } 1050 }
1051 } 1051 }
1052 1052
1053 } // namespace chromeos 1053 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/settings/cros_settings_unittest.cc ('k') | chrome/browser/chromeos/settings/device_settings_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698