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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Self review Created 9 years, 8 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/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 #include <signal.h> 8 #include <signal.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 454
455 void WizardController::SkipRegistration() { 455 void WizardController::SkipRegistration() {
456 if (current_screen_ == GetRegistrationScreen()) 456 if (current_screen_ == GetRegistrationScreen())
457 OnRegistrationSkipped(); 457 OnRegistrationSkipped();
458 else 458 else
459 LOG(ERROR) << "Registration screen is not active."; 459 LOG(ERROR) << "Registration screen is not active.";
460 } 460 }
461 461
462 // static 462 // static
463 void WizardController::RegisterPrefs(PrefService* local_state) { 463 void WizardController::RegisterPrefs(PrefService* local_state) {
464 local_state->RegisterBooleanPref(kOobeComplete, false); 464 local_state->RegisterBooleanPref(kOobeComplete,
465 local_state->RegisterIntegerPref(kDeviceRegistered, -1); 465 false,
466 local_state->RegisterBooleanPref(kEulaAccepted, false); 466 false /* don't sync pref */);
467 local_state->RegisterStringPref(kInitialLocale, "en-US"); 467 local_state->RegisterIntegerPref(kDeviceRegistered,
468 -1,
469 false /* don't sync pref */);
470 local_state->RegisterBooleanPref(kEulaAccepted,
471 false,
472 false /* don't sync pref */);
473 local_state->RegisterStringPref(kInitialLocale,
474 "en-US",
475 false /* don't sync pref */);
468 // Check if the pref is already registered in case 476 // Check if the pref is already registered in case
469 // Preferences::RegisterUserPrefs runs before this code in the future. 477 // Preferences::RegisterUserPrefs runs before this code in the future.
470 if (local_state->FindPreference(prefs::kAccessibilityEnabled) == NULL) { 478 if (local_state->FindPreference(prefs::kAccessibilityEnabled) == NULL) {
471 local_state->RegisterBooleanPref(prefs::kAccessibilityEnabled, false); 479 local_state->RegisterBooleanPref(prefs::kAccessibilityEnabled,
480 false,
481 false /* don't sync pref */);
472 } 482 }
473 } 483 }
474 484
475 /////////////////////////////////////////////////////////////////////////////// 485 ///////////////////////////////////////////////////////////////////////////////
476 // WizardController, ExitHandlers: 486 // WizardController, ExitHandlers:
477 void WizardController::OnNetworkConnected() { 487 void WizardController::OnNetworkConnected() {
478 if (is_official_build_) { 488 if (is_official_build_) {
479 if (!IsEulaAccepted()) { 489 if (!IsEulaAccepted()) {
480 ShowEulaScreen(); 490 ShowEulaScreen();
481 } else { 491 } else {
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 return contents_; 902 return contents_;
893 } 903 }
894 904
895 chromeos::ScreenObserver* WizardController::GetObserver(WizardScreen* screen) { 905 chromeos::ScreenObserver* WizardController::GetObserver(WizardScreen* screen) {
896 return observer_ ? observer_ : this; 906 return observer_ ? observer_ : this;
897 } 907 }
898 908
899 void WizardController::SetZeroDelays() { 909 void WizardController::SetZeroDelays() {
900 kShowDelayMs = 0; 910 kShowDelayMs = 0;
901 } 911 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698