Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Remove the Relaunch into Chrome immersive mode for Windows 7 for M39
Browse files Browse the repository at this point in the history
BUG=356475
R=cpu@chromium.org
TBR=sky

Review URL: https://codereview.chromium.org/666473005

Cr-Commit-Position: refs/branch-heads/2171@{#176}
Cr-Branched-From: 267aeeb-refs/heads/master@{#297060}
  • Loading branch information
Anantanarayanan Iyengar committed Oct 17, 2014
1 parent 2c7faca commit e3d5959
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions chrome/browser/ui/toolbar/wrench_menu_model.cc
Original file line number Diff line number Diff line change
Expand Up @@ -556,24 +556,15 @@ void WrenchMenuModel::Build() {
}

#if defined(OS_WIN)
// Windows 8 can support ASH mode using WARP, but Windows 7 requires a working
// GPU compositor.
if ((base::win::GetVersion() >= base::win::VERSION_WIN7 &&
content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) ||
(base::win::GetVersion() >= base::win::VERSION_WIN8)) {
if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) {
if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {
// ASH/Metro mode, add the 'Relaunch Chrome in desktop mode'.
AddSeparator(ui::NORMAL_SEPARATOR);
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);
if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
AddItemWithStringId(IDC_WIN8_METRO_RESTART, IDS_WIN8_METRO_RESTART);
} else {
AddItemWithStringId(IDC_WIN_CHROMEOS_RESTART, IDS_WIN_CHROMEOS_RESTART);
}
AddItemWithStringId(IDC_WIN8_METRO_RESTART, IDS_WIN8_METRO_RESTART);
}
}
#endif
Expand Down

0 comments on commit e3d5959

Please sign in to comment.