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

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

Issue 498573003: Add relaunch into ASH and desktop support for Chrome on Windows 7. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed build error Created 6 years, 4 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 93ece73f9492e9d54c4d014565956e722f54eeb3..c99931a5af2bf43a10621571fa836b45657d2428 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -545,15 +545,6 @@ void WrenchMenuModel::Build() {
if (ShouldShowNewIncognitoWindowMenuItem())
AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
-#if defined(OS_WIN) && !defined(NDEBUG) && defined(USE_ASH)
- if (base::win::GetVersion() < base::win::VERSION_WIN8 &&
- chrome::HOST_DESKTOP_TYPE_NATIVE != chrome::HOST_DESKTOP_TYPE_ASH) {
- AddItemWithStringId(IDC_TOGGLE_ASH_DESKTOP,
- ash::Shell::HasInstance() ? IDS_CLOSE_ASH_DESKTOP :
- IDS_OPEN_ASH_DESKTOP);
- }
-#endif
-
bookmark_sub_menu_model_.reset(new BookmarkSubMenuModel(this, browser_));
AddSubMenuWithStringId(IDC_BOOKMARKS_MENU, IDS_BOOKMARKS_MENU,
bookmark_sub_menu_model_.get());
@@ -567,32 +558,23 @@ void WrenchMenuModel::Build() {
}
#if defined(OS_WIN)
-
cpu_(ooo_6.6-7.5) 2014/08/22 21:47:11 same question about mac in the next line (USE_AURA
ananta 2014/08/22 22:17:53 under OS_WIN. So no issue
-#if defined(USE_AURA)
- if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
+ if (base::win::GetVersion() >= base::win::VERSION_WIN7 &&
content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) {
if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {
- // Metro mode, add the 'Relaunch Chrome in desktop mode'.
+ // ASH/Metro mode, add the 'Relaunch Chrome in desktop mode'.
AddSeparator(ui::NORMAL_SEPARATOR);
- AddItemWithStringId(IDC_WIN8_DESKTOP_RESTART, IDS_WIN8_DESKTOP_RESTART);
+ AddItemWithStringId(IDC_WIN_DESKTOP_RESTART, IDS_WIN_DESKTOP_RESTART);
} else {
// In Windows 8 desktop, add the 'Relaunch Chrome in Windows 8 mode'.
+ // In Windows 7 desktop, add the 'Relaunch Chrome in Windows ASH mode'
AddSeparator(ui::NORMAL_SEPARATOR);
- AddItemWithStringId(IDC_WIN8_METRO_RESTART, IDS_WIN8_METRO_RESTART);
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
+ AddItemWithStringId(IDC_WIN8_METRO_RESTART, IDS_WIN8_METRO_RESTART);
+ } else {
+ AddItemWithStringId(IDC_WIN_ASH_RESTART, IDS_WIN_ASH_RESTART);
+ }
}
}
-#else
- if (base::win::IsMetroProcess()) {
- // Metro mode, add the 'Relaunch Chrome in desktop mode'.
- AddSeparator(ui::NORMAL_SEPARATOR);
- AddItemWithStringId(IDC_WIN8_DESKTOP_RESTART, IDS_WIN8_DESKTOP_RESTART);
- } else {
- // In Windows 8 desktop, add the 'Relaunch Chrome in Windows 8 mode'.
- AddSeparator(ui::NORMAL_SEPARATOR);
- AddItemWithStringId(IDC_WIN8_METRO_RESTART, IDS_WIN8_METRO_RESTART);
- }
-#endif
-
#endif
// Append the full menu including separators. The final separator only gets

Powered by Google App Engine
This is Rietveld 408576698