| OLD | NEW | 
|    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/file_util.h" |   11 #include "base/file_util.h" | 
|   12 #include "base/logging.h" |   12 #include "base/logging.h" | 
|   13 #include "base/string_util.h" |   13 #include "base/string_util.h" | 
|   14 #include "base/threading/thread_restrictions.h" |   14 #include "base/threading/thread_restrictions.h" | 
|   15 #include "base/values.h" |   15 #include "base/values.h" | 
|   16 #include "chrome/browser/browser_process.h" |   16 #include "chrome/browser/browser_process.h" | 
|   17 #include "chrome/browser/chromeos/cros/cros_library.h" |   17 #include "chrome/browser/chromeos/cros/cros_library.h" | 
|   18 #include "chrome/browser/chromeos/cros/network_library.h" |   18 #include "chrome/browser/chromeos/cros/network_library.h" | 
|   19 #include "chrome/browser/chromeos/settings/cros_settings.h" |   19 #include "chrome/browser/chromeos/settings/cros_settings.h" | 
|   20 #include "chrome/browser/chromeos/settings/cros_settings_names.h" |   20 #include "chrome/browser/chromeos/settings/cros_settings_names.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/app_pack_updater.h" |   22 #include "chrome/browser/policy/app_pack_updater.h" | 
|   23 #include "chrome/browser/policy/browser_policy_connector.h" |   23 #include "chrome/browser/policy/browser_policy_connector.h" | 
|   24 #include "chrome/browser/policy/cloud_policy_constants.h" |   24 #include "chrome/browser/policy/cloud_policy_constants.h" | 
|   25 #include "chrome/browser/policy/proto/device_management_backend.pb.h" |   25 #include "chrome/browser/policy/proto/device_management_backend.pb.h" | 
 |   26 #include "chrome/browser/prefs/pref_service.h" | 
|   26 #include "chrome/browser/ui/options/options_util.h" |   27 #include "chrome/browser/ui/options/options_util.h" | 
|   27 #include "chrome/common/chrome_switches.h" |   28 #include "chrome/common/chrome_switches.h" | 
|   28 #include "chrome/installer/util/google_update_settings.h" |   29 #include "chrome/installer/util/google_update_settings.h" | 
|   29  |   30  | 
|   30 using google::protobuf::RepeatedPtrField; |   31 using google::protobuf::RepeatedPtrField; | 
|   31  |   32  | 
|   32 namespace em = enterprise_management; |   33 namespace em = enterprise_management; | 
|   33  |   34  | 
|   34 namespace chromeos { |   35 namespace chromeos { | 
|   35  |   36  | 
| (...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  771 void DeviceSettingsProvider::AttemptMigration() { |  772 void DeviceSettingsProvider::AttemptMigration() { | 
|  772   if (device_settings_service_->HasPrivateOwnerKey()) { |  773   if (device_settings_service_->HasPrivateOwnerKey()) { | 
|  773     PrefValueMap::const_iterator i; |  774     PrefValueMap::const_iterator i; | 
|  774     for (i = migration_values_.begin(); i != migration_values_.end(); ++i) |  775     for (i = migration_values_.begin(); i != migration_values_.end(); ++i) | 
|  775       DoSet(i->first, *i->second); |  776       DoSet(i->first, *i->second); | 
|  776     migration_values_.Clear(); |  777     migration_values_.Clear(); | 
|  777   } |  778   } | 
|  778 } |  779 } | 
|  779  |  780  | 
|  780 }  // namespace chromeos |  781 }  // namespace chromeos | 
| OLD | NEW |