Check if current screen is already showing during OOBE.

BUG= http://crosbug.com/3053
TEST=N/A

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

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

2 files changed, 3 insertions, 2 deletions

diff --git a/chrome/browser/chromeos/login/update_screen.cc b/chrome/browser/chromeos/login/update_screen.cc
index 231e701..c664082 100644
--- a/chrome/browser/chromeos/login/update_screen.cc
+++ b/chrome/browser/chromeos/login/update_screen.cc
@@ -75,7 +75,6 @@ void UpdateScreen::StartUpdate() {
   view()->set_controller(this);
 
   // Start the minimal update time timer.
-  DCHECK(!minimal_update_time_timer_.IsRunning());
   minimal_update_time_timer_.Start(
       base::TimeDelta::FromSeconds(kMinimalUpdateTime),
       this,
@@ -91,12 +90,12 @@ void UpdateScreen::CancelUpdate() {
 #if !defined(OFFICIAL_BUILD)
   update_result_ = UPGRADE_ALREADY_UP_TO_DATE;
   update_error_ = GOOGLE_UPDATE_NO_ERROR;
-  minimal_update_time_timer_.Stop();
   ExitUpdate();
 #endif
 }
 
 void UpdateScreen::ExitUpdate() {
+  minimal_update_time_timer_.Stop();
   ScreenObserver* observer = delegate()->GetObserver(this);
   if (observer) {
     switch (update_result_) {
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 90ce918..c3d50ee 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -363,6 +363,8 @@ void WizardController::OnUpdateNetworkError() {
 // WizardController, private:
 
 void WizardController::SetCurrentScreen(WizardScreen* new_current) {
+  if (current_screen_ == new_current)
+    return;
   if (current_screen_)
     current_screen_->Hide();
   current_screen_ = new_current;