Index: chrome/browser/chromeos/login/wizard_controller.cc |
=================================================================== |
--- chrome/browser/chromeos/login/wizard_controller.cc (revision 63306) |
+++ chrome/browser/chromeos/login/wizard_controller.cc (working copy) |
@@ -189,12 +189,11 @@ |
bool manifest_loaded = customization->LoadManifestFromFile( |
startup_manifest_path); |
if (manifest_loaded) { |
- LOG(INFO) << "Startup manifest loaded successfully"; |
+ VLOG(1) << "Startup manifest loaded successfully"; |
return customization.release(); |
- } else { |
- LOG(ERROR) << "Error loading startup manifest. " << |
- kStartupCustomizationManifestPath; |
} |
+ LOG(ERROR) << "Error loading startup manifest: " |
+ << kStartupCustomizationManifestPath; |
} |
return NULL; |
@@ -264,7 +263,7 @@ |
void WizardController::Init(const std::string& first_screen_name, |
const gfx::Rect& screen_bounds) { |
- LOG(INFO) << "Starting OOBE wizard with screen: " << first_screen_name; |
+ VLOG(1) << "Starting OOBE wizard with screen: " << first_screen_name; |
DCHECK(!contents_); |
first_screen_name_ = first_screen_name; |
@@ -415,13 +414,13 @@ |
} |
void WizardController::ShowAccountScreen() { |
- LOG(INFO) << "Showing create account screen."; |
+ VLOG(1) << "Showing create account screen."; |
SetStatusAreaVisible(true); |
SetCurrentScreen(GetAccountScreen()); |
} |
void WizardController::ShowUpdateScreen() { |
- LOG(INFO) << "Showing update screen."; |
+ VLOG(1) << "Showing update screen."; |
SetStatusAreaVisible(true); |
SetCurrentScreen(GetUpdateScreen()); |
// There is no special step for update. |
@@ -433,14 +432,14 @@ |
} |
void WizardController::ShowUserImageScreen() { |
- LOG(INFO) << "Showing user image screen."; |
+ VLOG(1) << "Showing user image screen."; |
SetStatusAreaVisible(false); |
SetCurrentScreen(GetUserImageScreen()); |
background_view_->SetOobeProgress(chromeos::BackgroundView::PICTURE); |
} |
void WizardController::ShowEulaScreen() { |
- LOG(INFO) << "Showing EULA screen."; |
+ VLOG(1) << "Showing EULA screen."; |
SetStatusAreaVisible(false); |
SetCurrentScreen(GetEulaScreen()); |
#if defined(OFFICIAL_BUILD) |
@@ -450,12 +449,12 @@ |
void WizardController::ShowRegistrationScreen() { |
if (!IsRegistrationScreenValid(GetCustomization())) { |
- LOG(INFO) << |
- "Skipping registration screen: manifest not defined or invalid URL."; |
+ VLOG(1) << "Skipping registration screen: manifest not defined or invalid " |
+ "URL."; |
OnRegistrationSkipped(); |
return; |
} |
- LOG(INFO) << "Showing registration screen."; |
+ VLOG(1) << "Showing registration screen."; |
SetStatusAreaVisible(true); |
SetCurrentScreen(GetRegistrationScreen()); |
#if defined(OFFICIAL_BUILD) |
@@ -464,7 +463,7 @@ |
} |
void WizardController::ShowHTMLPageScreen() { |
- LOG(INFO) << "Showing HTML page screen."; |
+ VLOG(1) << "Showing HTML page screen."; |
SetStatusAreaVisible(true); |
background_view_->SetOobeProgressBarVisible(false); |
SetCurrentScreen(GetHTMLPageScreen()); |
@@ -792,7 +791,7 @@ |
/////////////////////////////////////////////////////////////////////////////// |
// WizardController, chromeos::ScreenObserver overrides: |
void WizardController::OnExit(ExitCodes exit_code) { |
- LOG(INFO) << "Wizard screen exit code: " << exit_code; |
+ VLOG(1) << "Wizard screen exit code: " << exit_code; |
switch (exit_code) { |
case LOGIN_SIGN_IN_SELECTED: |
OnLoginSignInSelected(); |
@@ -872,7 +871,7 @@ |
// Declared in browser_dialogs.h so that others don't need to depend on our .h. |
void ShowLoginWizard(const std::string& first_screen_name, |
const gfx::Size& size) { |
- LOG(INFO) << "showing login screen: " << first_screen_name; |
+ VLOG(1) << "Showing login screen: " << first_screen_name; |
// The login screen will enable alternate keyboard layouts, but we don't want |
// to start the IME process unless one is selected. |
@@ -910,8 +909,8 @@ |
// If we already have user we assume that it is not a second part of OOBE. |
// See http://crosbug.com/6289 |
if (!WizardController::IsDeviceRegistered() && !users.empty()) { |
- LOG(INFO) << "Mark device registered because there are remembered users: " |
- << users.size(); |
+ VLOG(1) << "Mark device registered because there are remembered users: " |
+ << users.size(); |
WizardController::MarkDeviceRegistered(); |
} |
@@ -939,10 +938,10 @@ |
const std::string current_locale = |
g_browser_process->local_state()->GetString( |
prefs::kApplicationLocale); |
- LOG(INFO) << "current locale: " << current_locale; |
+ VLOG(1) << "Current locale: " << current_locale; |
if (current_locale.empty()) { |
locale = controller->GetCustomization()->initial_locale(); |
- LOG(INFO) << "initial locale: " << locale; |
+ VLOG(1) << "Initial locale: " << locale; |
if (!locale.empty()) { |
ResourceBundle::ReloadSharedInstance(locale); |
} |
@@ -963,7 +962,7 @@ |
// Set initial timezone if specified by customization. |
const std::string timezone_name = |
controller->GetCustomization()->initial_timezone(); |
- LOG(INFO) << "initial time zone: " << timezone_name; |
+ VLOG(1) << "Initial time zone: " << timezone_name; |
// Apply locale customizations only once so preserve whatever locale |
// user has changed to during OOBE. |
if (!timezone_name.empty()) { |