[ChromeOS] Move ChromeOS upgrade check logic into UpgradeDetector.

chrome/browser/upgrade_detector.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.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 17 matching lines @@
 
 #if defined(OS_WIN)
 #include "chrome/installer/util/install_util.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/cocoa/keystone_glue.h"
 #elif defined(OS_POSIX)
 #include "base/process_util.h"
 #include "base/version.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/update_library.h"
+#endif
+
 namespace {
 
 // How long (in milliseconds) to wait (each cycle) before checking whether
 // Chrome's been upgraded behind our back.
 const int kCheckForUpgradeMs = 2 * 60 * 60 * 1000;  // 2 hours.
 
 // How long to wait (each cycle) before checking which severity level we should
 // be at. Once we reach the highest severity, the timer will stop.
 const int kNotifyCycleTimeMs = 20 * 60 * 1000;  // 20 minutes.
 
@@ skipping 150 matching lines @@
 
 UpgradeDetector::~UpgradeDetector() {
 }
 
 // static
 UpgradeDetector* UpgradeDetector::GetInstance() {
   return Singleton<UpgradeDetector>::get();
 }
 
 void UpgradeDetector::CheckForUpgrade() {
+#if defined(OS_CHROMEOS)
+  // For ChromeOS, check update library status to detect upgrade.
+  if (chromeos::CrosLibrary::Get()->GetUpdateLibrary()->status().status ==
+      chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT) {

[Finnur, 2011/05/24 10:38:39]

I take it this is appropriate to be called on the UI thread?

+    UpgradeDetected();
+  }
+#else
   method_factory_.RevokeAll();
   Task* callback_task =
       method_factory_.NewRunnableMethod(&UpgradeDetector::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_));
+#endif
 }
 
 void UpgradeDetector::UpgradeDetected() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Stop the recurring timer (that is checking for changes).
   detect_upgrade_timer_.Stop();
 
   upgrade_detected_time_ = base::Time::Now();
 
@@ skipping 61 matching lines @@
     }
   }
 
   notify_upgrade_ = true;
 
   NotificationService::current()->Notify(
       NotificationType::UPGRADE_RECOMMENDED,
       Source<UpgradeDetector>(this),
       NotificationService::NoDetails());
 }