[cros] Make sure that update screen will be skipped when shortcut is pressed.

chrome/browser/chromeos/login/update_screen.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/update_screen.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
@@ skipping 50 matching lines @@
   }
 
   switch (status) {
     case UPDATE_STATUS_CHECKING_FOR_UPDATE:
       // Do nothing in these cases, we don't want to notify the user of the
       // check unless there is an update.
       break;
     case UPDATE_STATUS_UPDATE_AVAILABLE:
       view()->SetProgress(kBeforeDownloadProgress);
       if (!HasCriticalUpdate()) {
-        VLOG(1) << "Noncritical update available: "
-                << library->status().new_version;
-        ExitUpdate();
+        LOG(INFO) << "Noncritical update available: "
+                  << library->status().new_version;
+        ExitUpdate(false);
       } else {
-        VLOG(1) << "Critical update available: "
-                << library->status().new_version;
+        LOG(INFO) << "Critical update available: "
+                  << library->status().new_version;
       }
       break;
     case UPDATE_STATUS_DOWNLOADING:
       {
         if (!is_downloading_update_) {
           // Because update engine doesn't send UPDATE_STATUS_UPDATE_AVAILABLE
           // we need to is update critical on first downloading notification.
           is_downloading_update_ = true;
           if (!HasCriticalUpdate()) {
-            VLOG(1) << "Non-critical update available: "
-                    << library->status().new_version;
-            ExitUpdate();
+            LOG(INFO) << "Non-critical update available: "
+                      << library->status().new_version;
+            ExitUpdate(false);
           } else {
-            VLOG(1) << "Critical update available: "
-                    << library->status().new_version;
+            LOG(INFO) << "Critical update available: "
+                      << library->status().new_version;
           }
         }
         view()->ShowCurtain(false);
         int download_progress = static_cast<int>(
             library->status().download_progress * kDownloadProgressIncrement);
         view()->SetProgress(kBeforeDownloadProgress + download_progress);
       }
       break;
     case UPDATE_STATUS_VERIFYING:
       view()->SetProgress(kBeforeVerifyingProgress);
       break;
     case UPDATE_STATUS_FINALIZING:
       view()->SetProgress(kBeforeFinalizingProgress);
       break;
     case UPDATE_STATUS_UPDATED_NEED_REBOOT:
       // Make sure that first OOBE stage won't be shown after reboot.
       WizardController::MarkOobeCompleted();
       view()->SetProgress(kProgressComplete);
       if (HasCriticalUpdate()) {
         view()->ShowCurtain(false);
         VLOG(1) << "Initiate reboot after update";
         CrosLibrary::Get()->GetUpdateLibrary()->RebootAfterUpdate();
         reboot_timer_.Start(base::TimeDelta::FromSeconds(reboot_check_delay_),
                             this,
                             &UpdateScreen::OnWaitForRebootTimeElapsed);
       } else {
-        ExitUpdate();
+        ExitUpdate(false);
       }
       break;
     case UPDATE_STATUS_IDLE:
     case UPDATE_STATUS_ERROR:
     case UPDATE_STATUS_REPORTING_ERROR_EVENT:
-      ExitUpdate();
+      ExitUpdate(false);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void UpdateScreen::StartUpdate() {
   // Reset view.
   view()->Reset();
@@ skipping 11 matching lines @@
   }
 
   view()->SetProgress(kBeforeUpdateCheckProgress);
 
   if (!CrosLibrary::Get()->EnsureLoaded()) {
     LOG(ERROR) << "Error loading CrosLibrary";
   } else {
     CrosLibrary::Get()->GetUpdateLibrary()->AddObserver(this);
     VLOG(1) << "Initiate update check";
     if (!CrosLibrary::Get()->GetUpdateLibrary()->CheckForUpdate()) {
-      ExitUpdate();
+      ExitUpdate(true);
     }
   }
 }
 
 void UpdateScreen::CancelUpdate() {
   // Screen has longer lifetime than it's view.
   // View is deleted after wizard proceeds to the next screen.
   if (view())
-    ExitUpdate();
+    ExitUpdate(true);
 }
 
-void UpdateScreen::ExitUpdate() {
+void UpdateScreen::ExitUpdate(bool forced) {
   maximal_curtain_time_timer_.Stop();
   ScreenObserver* observer = delegate()->GetObserver(this);
 
   if (!CrosLibrary::Get()->EnsureLoaded()) {
     observer->OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE);
+    return;
+  }
+
+  if (forced) {
+    observer->OnExit(ScreenObserver::UPDATE_NOUPDATE);
+    return;
   }
 
   UpdateLibrary* update_library = CrosLibrary::Get()->GetUpdateLibrary();
   update_library->RemoveObserver(this);
   switch (update_library->status().status) {
     case UPDATE_STATUS_UPDATE_AVAILABLE:
     case UPDATE_STATUS_UPDATED_NEED_REBOOT:
     case UPDATE_STATUS_DOWNLOADING:
+    case UPDATE_STATUS_FINALIZING:
+    case UPDATE_STATUS_VERIFYING:
       DCHECK(!HasCriticalUpdate());
       // Noncritical update, just exit screen as if there is no update.
       // no break
     case UPDATE_STATUS_IDLE:
       observer->OnExit(ScreenObserver::UPDATE_NOUPDATE);
       break;
     case UPDATE_STATUS_ERROR:
     case UPDATE_STATUS_REPORTING_ERROR_EVENT:
       observer->OnExit(checking_for_update_ ?
           ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE :
@@ skipping 41 matching lines @@
   // TODO(dpolukhin): Analyze file content. Now we can just assume that
   // if the file exists and not empty, there is critical update.
   return true;
 }
 
 void UpdateScreen::SetAllUpdatesCritical(bool is_critical) {
   is_all_updates_critical_ = is_critical;
 }
 
 }  // namespace chromeos