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

Side by Side Diff: chrome/browser/chromeos/customization_document.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really fix. And rebase Created 9 years, 7 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/customization_document.h" 5 #include "chrome/browser/chromeos/customization_document.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 } 257 }
258 258
259 // static 259 // static
260 ServicesCustomizationDocument* ServicesCustomizationDocument::GetInstance() { 260 ServicesCustomizationDocument* ServicesCustomizationDocument::GetInstance() {
261 return Singleton<ServicesCustomizationDocument, 261 return Singleton<ServicesCustomizationDocument,
262 DefaultSingletonTraits<ServicesCustomizationDocument> >::get(); 262 DefaultSingletonTraits<ServicesCustomizationDocument> >::get();
263 } 263 }
264 264
265 // static 265 // static
266 void ServicesCustomizationDocument::RegisterPrefs(PrefService* local_state) { 266 void ServicesCustomizationDocument::RegisterPrefs(PrefService* local_state) {
267 local_state->RegisterBooleanPref(kServicesCustomizationAppliedPref, false); 267 local_state->RegisterBooleanPref(kServicesCustomizationAppliedPref, false,
268 PrefService::UNSYNCABLE_PREF);
268 } 269 }
269 270
270 // static 271 // static
271 bool ServicesCustomizationDocument::WasApplied() { 272 bool ServicesCustomizationDocument::WasApplied() {
272 PrefService* prefs = g_browser_process->local_state(); 273 PrefService* prefs = g_browser_process->local_state();
273 return prefs->GetBoolean(kServicesCustomizationAppliedPref); 274 return prefs->GetBoolean(kServicesCustomizationAppliedPref);
274 } 275 }
275 276
276 // static 277 // static
277 void ServicesCustomizationDocument::SetApplied(bool val) { 278 void ServicesCustomizationDocument::SetApplied(bool val) {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 DictionaryValue* carrier_deal = NULL; 391 DictionaryValue* carrier_deal = NULL;
391 if (carriers->GetDictionary(*iter, &carrier_deal)) { 392 if (carriers->GetDictionary(*iter, &carrier_deal)) {
392 carrier_deals_[*iter] = new CarrierDeal(carrier_deal); 393 carrier_deals_[*iter] = new CarrierDeal(carrier_deal);
393 } 394 }
394 } 395 }
395 } 396 }
396 return true; 397 return true;
397 } 398 }
398 399
399 } // namespace chromeos 400 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/audio_mixer_alsa.cc ('k') | chrome/browser/chromeos/login/user_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698