Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
index cb668313e1bcab9ffc3bc5d007cb0fb8cfb5268c..5085fb32f180beed8d58596e2f57c7bfc7241006 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -23,6 +23,7 @@ |
#include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h" |
#include "chrome/browser/chromeos/system/runtime_environment.h" |
#include "chrome/browser/chromeos/system/statistics_provider.h" |
+#include "chrome/browser/chromeos/upgrade_detector_chromeos.h" |
#include "chrome/browser/defaults.h" |
#include "chrome/common/chrome_switches.h" |
#include "content/public/common/main_function_params.h" |
@@ -81,6 +82,11 @@ ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos( |
} |
ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() { |
+ // Shutdown the upgrade detector for Chrome OS. The upgrade detector |
+ // stops monitoring changes from the update engine. |
+ if (UpgradeDetectorChromeos::GetInstance()) |
+ UpgradeDetectorChromeos::GetInstance()->Shutdown(); |
+ |
// Shutdown the network change notifier for Chrome OS. The network |
// change notifier stops monitoring changes from the power manager and |
// the network manager. |
@@ -175,6 +181,10 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() { |
// the network manager. |
chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init(); |
+ // Likewise, initialize the upgrade detector for Chrome OS. The upgrade |
+ // detector starts to monitor changes from the update engine. |
+ UpgradeDetectorChromeos::GetInstance()->Init(); |
+ |
// For http://crosbug.com/p/5795 and http://crosbug.com/p/6245. |
// Enable Num Lock on X start up. |
if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) { |