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

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

Issue 1581473002: Remove base/win/metro.{cc|h} and some associated code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 4 years, 11 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/app_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/toolbar/app_menu_model.cc
index ddfc0f936d27bea52d8a50586c8716547a0c036d..77bb33211e6f1c4554d447786724633576445217 100644
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -74,11 +74,9 @@
#endif
#if defined(OS_WIN)
-#include "base/win/metro.h"
#include "base/win/shortcut.h"
#include "base/win/windows_version.h"
#include "chrome/browser/enumerate_modules_model_win.h"
-#include "chrome/browser/ui/metro_pin_tab_helper_win.h"
#include "content/public/browser/gpu_data_manager.h"
#endif
@@ -384,13 +382,7 @@ base::string16 AppMenuModel::GetLabelForCommandId(int command_id) const {
#elif defined(OS_WIN)
case IDC_PIN_TO_START_SCREEN: {
int string_id = IDS_PIN_TO_START_SCREEN;
- WebContents* web_contents =
- browser_->tab_strip_model()->GetActiveWebContents();
- MetroPinTabHelper* tab_helper =
- web_contents ? MetroPinTabHelper::FromWebContents(web_contents)
- : NULL;
- if (tab_helper && tab_helper->IsPinned())
- string_id = IDS_UNPIN_FROM_START_SCREEN;
+ // TODO(scottmg): Remove http://crbug.com/558054.
return l10n_util::GetStringUTF16(string_id);
}
#endif
@@ -770,7 +762,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) const {
return true;
}
case IDC_PIN_TO_START_SCREEN:
- return base::win::IsMetroProcess();
+ return false;
#else
case IDC_VIEW_INCOMPATIBILITIES:
case IDC_PIN_TO_START_SCREEN:

Powered by Google App Engine
This is Rietveld 408576698