3 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index ada0eae..6445ea6 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -46,7 +46,8 @@ WebUILoginView::WebUILoginView()
       profile_(NULL),
       webui_login_(NULL),
       status_window_(NULL),
-      host_window_frozen_(false) {
+      host_window_frozen_(false),
+      status_area_visibility_on_init_(true) {
 #if defined(TOUCH_UI)
   // Make sure the singleton KeyboardManager object is created.
   KeyboardManager::GetInstance();
@@ -137,6 +138,8 @@ void WebUILoginView::SetStatusAreaEnabled(bool enable) {
 void WebUILoginView::SetStatusAreaVisible(bool visible) {
   if (status_area_)
     status_area_->SetVisible(visible);
+  else
+    status_area_visibility_on_init_ = visible;
 }
 
 // WebUILoginView protected: ---------------------------------------------------
@@ -221,6 +224,7 @@ void WebUILoginView::InitStatusArea() {
   DCHECK(status_window_ == NULL);
   status_area_ = new StatusAreaView(this);
   status_area_->Init();
+  status_area_->SetVisible(status_area_visibility_on_init_);
 
   views::Widget* login_window = WebUILoginDisplay::GetLoginWindow();
   gfx::Size size = status_area_->GetPreferredSize();
diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h
index 72b7b64..38912d3 100644
--- a/chrome/browser/chromeos/login/webui_login_view.h
+++ b/chrome/browser/chromeos/login/webui_login_view.h
@@ -135,6 +135,9 @@ class WebUILoginView : public views::View,
   // Whether the host window is frozen.
   bool host_window_frozen_;
 
+  // Caches StatusArea visibility setting before it has been initialized.
+  bool status_area_visibility_on_init_;
+
   DISALLOW_COPY_AND_ASSIGN(WebUILoginView);
 };
 
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index beaa961..a2445314 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -238,12 +238,14 @@ chromeos::EnterpriseEnrollmentScreen*
 }
 
 void WizardController::ShowNetworkScreen() {
+  VLOG(1) << "Showing network screen.";
   SetStatusAreaVisible(false);
   SetCurrentScreen(GetNetworkScreen());
   host_->SetOobeProgress(chromeos::BackgroundView::SELECT_NETWORK);
 }
 
 void WizardController::ShowLoginScreen() {
+  VLOG(1) << "Showing login screen.";
   SetStatusAreaVisible(true);
   host_->SetOobeProgress(chromeos::BackgroundView::SIGNIN);
   host_->StartSignInScreen();