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

Unified Diff: chrome/browser/ui/views/toolbar_view.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/views/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 31e6247c6c320362a5a2e80679a75e8e7ed51ff5..93799ac4f55f08b602075c315eec0bbec672c34e 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/ui/view_ids.h"
#include "chrome/browser/ui/views/browser_actions_container.h"
#include "chrome/browser/ui/views/event_utils.h"
+#include "chrome/browser/ui/views/wrench_menu.h"
#include "chrome/browser/upgrade_detector.h"
#include "chrome/common/pref_names.h"
#include "content/browser/user_metrics.h"
@@ -37,12 +38,6 @@
#include "views/window/non_client_view.h"
#include "views/window/window.h"
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/update_library.h"
-#endif
-#include "chrome/browser/ui/views/wrench_menu.h"
-
#if defined(OS_WIN)
#include "chrome/browser/enumerate_modules_model_win.h"
#endif
@@ -619,12 +614,7 @@ void ToolbarView::RemovePaneFocus() {
// ToolbarView, private:
bool ToolbarView::IsUpgradeRecommended() {
-#if defined(OS_CHROMEOS)
- return (chromeos::CrosLibrary::Get()->GetUpdateLibrary()->status().status ==
- chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT);
-#else
return (UpgradeDetector::GetInstance()->notify_upgrade());
-#endif
}
bool ToolbarView::ShouldShowIncompatibilityWarning() {

Powered by Google App Engine
This is Rietveld 408576698