Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6694)

Unified Diff: chrome/browser/ui/toolbar/wrench_menu_model.cc

Issue 6966025: [ChromeOS] Move ChromeOS upgrade check logic into UpgradeDetector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index c1b5b4ad31f7bb21a8decb2619027108dafcc175..0862eb56681b356c86ffbcafaf519a73b01106d1 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -47,11 +47,6 @@
#include "chrome/browser/ui/browser_window.h"
#endif
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/update_library.h"
-#endif
-
#if defined(OS_WIN)
#include "chrome/browser/enumerate_modules_model_win.h"
#endif
@@ -333,12 +328,7 @@ bool WrenchMenuModel::IsCommandIdEnabled(int command_id) const {
bool WrenchMenuModel::IsCommandIdVisible(int command_id) const {
if (command_id == IDC_UPGRADE_DIALOG) {
-#if defined(OS_CHROMEOS)
- return (chromeos::CrosLibrary::Get()->GetUpdateLibrary()->status().status
- == chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT);
-#else
return UpgradeDetector::GetInstance()->notify_upgrade();
-#endif
} else if (command_id == IDC_VIEW_INCOMPATIBILITIES) {
#if defined(OS_WIN)
EnumerateModulesModel* loaded_modules =

Powered by Google App Engine
This is Rietveld 408576698