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

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

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix double registration in Chrome Frame test. Created 7 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 | 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_cache.h" 5 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "chrome/browser/chromeos/settings/cros_settings.h" 11 #include "chrome/browser/chromeos/settings/cros_settings.h"
12 #include "chrome/browser/policy/proto/device_management_backend.pb.h" 12 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
13 #include "chrome/browser/prefs/pref_registry_simple.h"
13 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
14 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
15 16
16 namespace em = enterprise_management; 17 namespace em = enterprise_management;
17 18
18 namespace chromeos { 19 namespace chromeos {
19 20
20 namespace device_settings_cache { 21 namespace device_settings_cache {
21 22
22 void RegisterPrefs(PrefServiceSimple* local_state) { 23 void RegisterPrefs(PrefRegistrySimple* registry) {
23 local_state->RegisterStringPref(prefs::kDeviceSettingsCache, "invalid"); 24 registry->RegisterStringPref(prefs::kDeviceSettingsCache, "invalid");
24 } 25 }
25 26
26 bool Store(const em::PolicyData& policy, PrefService* local_state) { 27 bool Store(const em::PolicyData& policy, PrefService* local_state) {
27 if (local_state) { 28 if (local_state) {
28 std::string policy_string = policy.SerializeAsString(); 29 std::string policy_string = policy.SerializeAsString();
29 std::string encoded; 30 std::string encoded;
30 if (!base::Base64Encode(policy_string, &encoded)) { 31 if (!base::Base64Encode(policy_string, &encoded)) {
31 LOG(ERROR) << "Can't encode policy in base64."; 32 LOG(ERROR) << "Can't encode policy in base64.";
32 return false; 33 return false;
33 } 34 }
(...skipping 14 matching lines...) Expand all
48 return false; 49 return false;
49 } 50 }
50 return policy->ParseFromString(policy_string); 51 return policy->ParseFromString(policy_string);
51 } 52 }
52 return false; 53 return false;
53 } 54 }
54 55
55 } // namespace device_settings_cache 56 } // namespace device_settings_cache
56 57
57 } // namespace chromeos 58 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_cache.h ('k') | chrome/browser/chromeos/status/data_promo_notification.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698