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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 14362031: Move part of WizardController static code to StartupUtils (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fighting with whitespaces again Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/existing_user_controller.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index e54bf0eaaa48fd592750f6eb2c2640909f6b643f..77cb8a1f18491c8a91adc1dd5fa2aa6c8eb77099 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -28,6 +28,7 @@
#include "chrome/browser/chromeos/login/helper.h"
#include "chrome/browser/chromeos/login/login_display_host.h"
#include "chrome/browser/chromeos/login/login_utils.h"
+#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/net/connectivity_state_helper.h"
@@ -784,8 +785,8 @@ void ExistingUserController::OnProfilePrepared(Profile* profile) {
#endif
// Mark the device as registered., i.e. the second part of OOBE as
// completed.
- if (!WizardController::IsDeviceRegistered())
- WizardController::MarkDeviceRegistered();
+ if (!StartupUtils::IsDeviceRegistered())
+ StartupUtils::MarkDeviceRegistered();
ActivateWizard(WizardController::kTermsOfServiceScreenName);
#ifndef NDEBUG
@@ -810,8 +811,8 @@ void ExistingUserController::OnOffTheRecordLoginSuccess() {
offline_failed_ = false;
// Mark the device as registered., i.e. the second part of OOBE as completed.
- if (!WizardController::IsDeviceRegistered())
- WizardController::MarkDeviceRegistered();
+ if (!StartupUtils::IsDeviceRegistered())
+ StartupUtils::MarkDeviceRegistered();
LoginUtils::Get()->CompleteOffTheRecordLogin(guest_mode_url_);

Powered by Google App Engine
This is Rietveld 408576698