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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months 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
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 <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
16 #include "base/prefs/pref_service.h"
17 #include "base/threading/thread_restrictions.h" 16 #include "base/threading/thread_restrictions.h"
18 #include "base/values.h" 17 #include "base/values.h"
19 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" 19 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
21 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 20 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
22 #include "chrome/browser/chromeos/policy/device_local_account.h" 21 #include "chrome/browser/chromeos/policy/device_local_account.h"
23 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 22 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
24 #include "chrome/browser/chromeos/settings/cros_settings.h" 23 #include "chrome/browser/chromeos/settings/cros_settings.h"
25 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 24 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
26 #include "chrome/browser/metrics/metrics_reporting_state.h" 25 #include "chrome/browser/metrics/metrics_reporting_state.h"
27 #include "chrome/installer/util/google_update_settings.h" 26 #include "chrome/installer/util/google_update_settings.h"
28 #include "chromeos/chromeos_switches.h" 27 #include "chromeos/chromeos_switches.h"
29 #include "chromeos/dbus/cryptohome_client.h" 28 #include "chromeos/dbus/cryptohome_client.h"
30 #include "chromeos/dbus/dbus_thread_manager.h" 29 #include "chromeos/dbus/dbus_thread_manager.h"
31 #include "chromeos/settings/cros_settings_names.h" 30 #include "chromeos/settings/cros_settings_names.h"
32 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 31 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
32 #include "components/prefs/pref_service.h"
33 #include "policy/proto/device_management_backend.pb.h" 33 #include "policy/proto/device_management_backend.pb.h"
34 34
35 using google::protobuf::RepeatedField; 35 using google::protobuf::RepeatedField;
36 using google::protobuf::RepeatedPtrField; 36 using google::protobuf::RepeatedPtrField;
37 37
38 namespace em = enterprise_management; 38 namespace em = enterprise_management;
39 39
40 namespace chromeos { 40 namespace chromeos {
41 41
42 namespace { 42 namespace {
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 // Notify the observers we are done. 789 // Notify the observers we are done.
790 std::vector<base::Closure> callbacks; 790 std::vector<base::Closure> callbacks;
791 callbacks.swap(callbacks_); 791 callbacks.swap(callbacks_);
792 for (size_t i = 0; i < callbacks.size(); ++i) 792 for (size_t i = 0; i < callbacks.size(); ++i)
793 callbacks[i].Run(); 793 callbacks[i].Run();
794 794
795 return settings_loaded; 795 return settings_loaded;
796 } 796 }
797 797
798 } // namespace chromeos 798 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_provider.h ('k') | chrome/browser/chromeos/settings/owner_flags_storage.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698