Expose current_screen() for tests.

Removed duplicated windows closing from OnLoginSignInSelected().

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/1267002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42460 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 9 deletions

diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 69ce58c..f1fc2e0 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -219,15 +219,6 @@ UpdateScreen* WizardController::GetUpdateScreen() {
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, ExitHandlers:
 void WizardController::OnLoginSignInSelected() {
-  // Close the windows now (which will delete them).
-  if (background_widget_) {
-    background_widget_->Close();
-    background_widget_ = NULL;
-  }
-
-  widget_->Close();
-  widget_ = NULL;
-
   // We're on the stack, so don't try and delete us now.
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index b7d1c67..c82a488 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -70,6 +70,10 @@ class WizardController : public chromeos::ScreenObserver,
   chromeos::AccountScreen* GetAccountScreen();
   UpdateScreen* GetUpdateScreen();
 
+  // Returns a pointer to the current screen or NULL if there's no such
+  // screen.
+  WizardScreen* current_screen() const { return current_screen_; }
+
  private:
   // Exit handlers:
   void OnLoginSignInSelected();