[cros] Show 'Checking for updates' state all that time during update check.

BUG=chromium-os:10163
TEST=Manual.

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

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

3 files changed, 0 insertions, 40 deletions

diff --git a/chrome/browser/chromeos/login/update_screen.cc b/chrome/browser/chromeos/login/update_screen.cc
index 49b67d8..2eb9b14 100644
--- a/chrome/browser/chromeos/login/update_screen.cc
+++ b/chrome/browser/chromeos/login/update_screen.cc
@@ -41,7 +41,6 @@ UpdateScreen::UpdateScreen(WizardScreenDelegate* delegate)
                                               kUpdateScreenWidth,
                                               kUpdateScreenHeight),
       checking_for_update_(true),
-      maximal_curtain_time_(0),
       reboot_check_delay_(0),
       is_downloading_update_(false),
       is_all_updates_critical_(false) {
@@ -134,17 +133,6 @@ void UpdateScreen::StartUpdate() {
   view()->Reset();
   view()->set_controller(this);
   is_downloading_update_ = false;
-
-  // Start the maximal curtain time timer.
-  if (maximal_curtain_time_ > 0) {
-    maximal_curtain_time_timer_.Start(
-        base::TimeDelta::FromSeconds(maximal_curtain_time_),
-        this,
-        &UpdateScreen::OnMaximalCurtainTimeElapsed);
-  } else {
-    view()->ShowCurtain(false);
-  }
-
   view()->SetProgress(kBeforeUpdateCheckProgress);
 
   if (!CrosLibrary::Get()->EnsureLoaded()) {
@@ -166,7 +154,6 @@ void UpdateScreen::CancelUpdate() {
 }
 
 void UpdateScreen::ExitUpdate(bool forced) {
-  maximal_curtain_time_timer_.Stop();
   ScreenObserver* observer = delegate()->GetObserver(this);
 
   if (!CrosLibrary::Get()->EnsureLoaded()) {
@@ -204,22 +191,11 @@ void UpdateScreen::ExitUpdate(bool forced) {
   }
 }
 
-void UpdateScreen::OnMaximalCurtainTimeElapsed() {
-  view()->ShowCurtain(false);
-}
-
 void UpdateScreen::OnWaitForRebootTimeElapsed() {
   LOG(ERROR) << "Unable to reboot - asking user for a manual reboot.";
   view()->ShowManualRebootInfo();
 }
 
-void UpdateScreen::SetMaximalCurtainTime(int seconds) {
-  if (seconds <= 0)
-    maximal_curtain_time_timer_.Stop();
-  DCHECK(!maximal_curtain_time_timer_.IsRunning());
-  maximal_curtain_time_ = seconds;
-}
-
 void UpdateScreen::SetRebootCheckDelay(int seconds) {
   if (seconds <= 0)
     reboot_timer_.Stop();
diff --git a/chrome/browser/chromeos/login/update_screen.h b/chrome/browser/chromeos/login/update_screen.h
index 6451938..2e6e657 100644
--- a/chrome/browser/chromeos/login/update_screen.h
+++ b/chrome/browser/chromeos/login/update_screen.h
@@ -41,10 +41,6 @@ class UpdateScreen: public DefaultViewScreen<chromeos::UpdateView>,
   // UPDATE_STATUS_REPORTING_ERROR_EVENT.
   virtual void ExitUpdate(bool forced);
 
-  // Maximal curtain time get/set, in seconds.
-  int maximal_curtain_time() const { return maximal_curtain_time_; }
-  void SetMaximalCurtainTime(int seconds);
-
   // Reboot check delay get/set, in seconds.
   int reboot_check_delay() const { return reboot_check_delay_; }
   void SetRebootCheckDelay(int seconds);
@@ -59,12 +55,8 @@ class UpdateScreen: public DefaultViewScreen<chromeos::UpdateView>,
 
  private:
   // Timer notification handlers.
-  void OnMaximalCurtainTimeElapsed();
   void OnWaitForRebootTimeElapsed();
 
-  // Timer for the interval while curtain view is shown.
-  base::OneShotTimer<UpdateScreen> maximal_curtain_time_timer_;
-
   // Timer for the interval to wait for the reboot.
   // If reboot didn't happen - ask user to reboot manually.
   base::OneShotTimer<UpdateScreen> reboot_timer_;
@@ -72,10 +64,6 @@ class UpdateScreen: public DefaultViewScreen<chromeos::UpdateView>,
   // True if in the process of checking for update.
   bool checking_for_update_;
 
-  // Maximal time (secs) the curtain view is shown. Updating progress is shown
-  // to the user when this time elapsed.
-  int maximal_curtain_time_;
-
   // Time in seconds after which we decide that the device has not rebooted
   // automatically. If reboot didn't happen during this interval, ask user to
   // reboot device manually.
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index d48309d..50aa4b2 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -71,9 +71,6 @@ const char kStartupCustomizationManifestPath[] =
 const char kOobeCompleteFlagFilePath[] =
     "/home/chronos/.oobe_completed";
 
-// Upadate window will be behind the curtain at most |kMaximalCurtainTimeSec|.
-const int kMaximalCurtainTimeSec = 15;
-
 // Time in seconds that we wait for the device to reboot.
 // If reboot didn't happen, ask user to reboot device manually.
 const int kWaitForRebootTimeSec = 3;
@@ -364,7 +361,6 @@ chromeos::AccountScreen* WizardController::GetAccountScreen() {
 chromeos::UpdateScreen* WizardController::GetUpdateScreen() {
   if (!update_screen_.get()) {
     update_screen_.reset(new chromeos::UpdateScreen(this));
-    update_screen_->SetMaximalCurtainTime(kMaximalCurtainTimeSec);
     update_screen_->SetRebootCheckDelay(kWaitForRebootTimeSec);
   }
   return update_screen_.get();