Index: chrome/browser/upgrade_detector_impl.h |
diff --git a/chrome/browser/upgrade_detector_impl.h b/chrome/browser/upgrade_detector_impl.h |
index 17dbd3edbc61c91e6f2614c26d6d51c1f0b943bd..07b2db0fc9070cc7aff739b20b8f3ace4b95d7a5 100644 |
--- a/chrome/browser/upgrade_detector_impl.h |
+++ b/chrome/browser/upgrade_detector_impl.h |
@@ -24,6 +24,9 @@ class UpgradeDetectorImpl : public UpgradeDetector { |
// Returns the singleton instance. |
static UpgradeDetectorImpl* GetInstance(); |
+ // Launches a task on the file thread to check if we have the latest version. |
+ virtual void CheckForUpgrade() OVERRIDE; |
+ |
private: |
friend struct DefaultSingletonTraits<UpgradeDetectorImpl>; |
@@ -32,12 +35,16 @@ class UpgradeDetectorImpl : public UpgradeDetector { |
// Start the timer that will call |CheckForUpgrade()|. |
void StartTimerForUpgradeCheck(); |
- // Launches a task on the file thread to check if we have the latest version. |
- void CheckForUpgrade(); |
- |
// Sends out a notification and starts a one shot timer to wait until |
// notifying the user. |
- void UpgradeDetected(UpgradeAvailable upgrade_available); |
+ void UpgradeStatusChanged(UpgradeAvailable upgrade_available); |
+ |
+ static void NotifyNoUpgrade( |
+ base::WeakPtr<UpgradeDetectorImpl> upgrade_detector); |
+ |
+ // Returns true after calling UpgradeDetected if elevation is needed to |
+ // upgrade or fix broken Omaha/Chrome. |
+ bool DetectElevationNeeded(); |
// Returns true after calling UpgradeDetected if current install is outdated. |
bool DetectOutdatedInstall(); |
@@ -45,7 +52,7 @@ class UpgradeDetectorImpl : public UpgradeDetector { |
// The function that sends out a notification (after a certain time has |
// elapsed) that lets the rest of the UI know we should start notifying the |
// user that a new version is available. |
- void NotifyOnUpgrade(); |
+ void NotifyUpgradeStatusChanged(); |
// Called on the FILE thread to detect an upgrade. Calls back UpgradeDetected |
// on the UI thread if so. Although it looks weird, this needs to be a static |