When critical updates have been installed and the user has been idle for quite some time, show a ...

chrome/browser/upgrade_detector_impl.cc

 // Copyright (c) 2011 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/upgrade_detector_impl.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 45 matching lines @@
     return interval_ms * 1000;  // Command line value is in seconds.
 
   return kCheckForUpgradeMs;
 }
 
 // This task checks the currently running version of Chrome against the
 // installed version. If the installed version is newer, it runs the passed
 // callback task. Otherwise it just deletes the task.
 class DetectUpgradeTask : public Task {
  public:
-  DetectUpgradeTask(Task* upgrade_detected_task, bool* is_unstable_channel)
+  DetectUpgradeTask(Task* upgrade_detected_task,
+                    bool* is_unstable_channel,
+                    bool* is_critical_upgrade)
       : upgrade_detected_task_(upgrade_detected_task),
-        is_unstable_channel_(is_unstable_channel) {
+        is_unstable_channel_(is_unstable_channel),
+        is_critical_upgrade_(is_critical_upgrade) {
   }
 
   virtual ~DetectUpgradeTask() {
     if (upgrade_detected_task_) {
       // This has to get deleted on the same thread it was created.
       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                               new DeleteTask<Task>(upgrade_detected_task_));
     }
   }
 
   virtual void Run() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
     scoped_ptr<Version> installed_version;
+    scoped_ptr<Version> critical_update;
 
 #if defined(OS_WIN)
     // Get the version of the currently *installed* instance of Chrome,
     // which might be newer than the *running* instance if we have been
     // upgraded in the background.
     // TODO(tommi): Check if using the default distribution is always the right
     // thing to do.
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     installed_version.reset(InstallUtil::GetChromeVersion(dist, false));
-    if (!installed_version.get()) {
-      // User level Chrome is not installed, check system level.
+
+    if (installed_version.get()) {
+#if defined(OS_WIN)
+      // Critical version detection is only supported for user-level Chrome
+      // since elevation is needed for system-level Chrome (and this runs in
+      // the background -- don't want to prompt).
+      critical_update.reset(InstallUtil::GetCriticalUpdateVersion(dist));
+#endif
+    } else {
+      // User-level Chrome is not installed, check system-level.
       installed_version.reset(InstallUtil::GetChromeVersion(dist, true));
     }
 #elif defined(OS_MACOSX)
     installed_version.reset(
         Version::GetVersionFromString(UTF16ToASCII(
             keystone_glue::CurrentlyInstalledVersion())));
 #elif defined(OS_POSIX)
     // POSIX but not Mac OS X: Linux, etc.
     CommandLine command_line(*CommandLine::ForCurrentProcess());
     command_line.AppendSwitch(switches::kProductVersion);
@@ skipping 21 matching lines @@
     if (running_version.get() == NULL) {
       NOTREACHED() << "Failed to parse version info";
       return;
     }
 
     // |installed_version| may be NULL when the user downgrades on Linux (by
     // switching from dev to beta channel, for example). The user needs a
     // restart in this case as well. See http://crbug.com/46547
     if (!installed_version.get() ||
         (installed_version->CompareTo(*running_version) > 0)) {
+      // If a more recent version is available, it might be that we are lacking
+      // a critical update, such as a zero-day fix.
+      *is_critical_upgrade_ =
+          critical_update.get() &&
+          (critical_update->CompareTo(*running_version) > 0);
+
+      // Fire off the upgrade detected task.
       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                               upgrade_detected_task_);
       upgrade_detected_task_ = NULL;
     }
   }
 
  private:
   Task* upgrade_detected_task_;
   bool* is_unstable_channel_;
+  bool* is_critical_upgrade_;
 };
 
 }  // namespace
 
 UpgradeDetectorImpl::UpgradeDetectorImpl()
     : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       is_unstable_channel_(false) {
   CommandLine command_line(*CommandLine::ForCurrentProcess());
   if (command_line.HasSwitch(switches::kDisableBackgroundNetworking))
     return;
@@ skipping 18 matching lines @@
 void UpgradeDetectorImpl::CheckForUpgrade() {
   method_factory_.RevokeAll();
   Task* callback_task =
       method_factory_.NewRunnableMethod(&UpgradeDetectorImpl::UpgradeDetected);
   // We use FILE as the thread to run the upgrade detection code on all
   // platforms. For Linux, this is because we don't want to block the UI thread
   // while launching a background process and reading its output; on the Mac and
   // on Windows checking for an upgrade requires reading a file.
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           new DetectUpgradeTask(callback_task,
-                                                &is_unstable_channel_));
+                                                &is_unstable_channel_,
+                                                &is_critical_upgrade_));
 }
 
 void UpgradeDetectorImpl::UpgradeDetected() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Stop the recurring timer (that is checking for changes).
   detect_upgrade_timer_.Stop();
 
   NotifyUpgradeDetected();
 
@@ skipping 16 matching lines @@
   // severity. This works in conjunction with the similar interval.empty()
   // check below.
   int64 time_passed = interval.empty() ? delta.InHours() : delta.InSeconds();
 
   if (is_unstable_channel_) {
     // There's only one threat level for unstable channels like dev and
     // canary, and it hits after one hour. During testing, it hits after one
     // minute.
     const int kUnstableThreshold = 1;
 
-    if (time_passed >= kUnstableThreshold) {
+    if (is_critical_upgrade_)
+      set_upgrade_notification_stage(UPGRADE_ANNOYANCE_CRITICAL);
+    else if (time_passed >= kUnstableThreshold) {
       set_upgrade_notification_stage(UPGRADE_ANNOYANCE_LOW);
 
       // That's as high as it goes.
       upgrade_notification_timer_.Stop();
     } else {
       return;  // Not ready to recommend upgrade.
     }
   } else {
     const int kMultiplier = interval.empty() ? 24 : 1;
     // 14 days when not testing, otherwise 14 seconds.
     const int kSevereThreshold = 14 * kMultiplier;
     const int kHighThreshold = 7 * kMultiplier;
     const int kElevatedThreshold = 4 * kMultiplier;
     const int kLowThreshold = 2 * kMultiplier;
 
     // These if statements must be sorted (highest interval first).
-    if (time_passed >= kSevereThreshold) {
-      set_upgrade_notification_stage(UPGRADE_ANNOYANCE_SEVERE);
+    if (time_passed >= kSevereThreshold || is_critical_upgrade_) {
+      set_upgrade_notification_stage(
+          is_critical_upgrade_ ? UPGRADE_ANNOYANCE_CRITICAL :
+                                 UPGRADE_ANNOYANCE_SEVERE);
 
       // We can't get any higher, baby.
       upgrade_notification_timer_.Stop();
     } else if (time_passed >= kHighThreshold) {
       set_upgrade_notification_stage(UPGRADE_ANNOYANCE_HIGH);
     } else if (time_passed >= kElevatedThreshold) {
       set_upgrade_notification_stage(UPGRADE_ANNOYANCE_ELEVATED);
     } else if (time_passed >= kLowThreshold) {
       set_upgrade_notification_stage(UPGRADE_ANNOYANCE_LOW);
     } else {
       return;  // Not ready to recommend upgrade.
     }
   }
 
   NotifyUpgradeRecommended();
 }
 
 // static
 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() {
   return Singleton<UpgradeDetectorImpl>::get();
 }
 
 // static
 UpgradeDetector* UpgradeDetector::GetInstance() {
   return UpgradeDetectorImpl::GetInstance();
 }