| 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 e320ba3e00772fc3aa4fc2dd85238e7cd5fca5db..c18c20390d0e5e141bedbc8ad703cc433d6a57f7 100644
|
| --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
|
| +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
|
| @@ -566,10 +566,7 @@ void WrenchMenuModel::Build() {
|
| }
|
|
|
| #if defined(OS_WIN)
|
| -
|
| -#if defined(USE_AURA)
|
| - if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
|
| - content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) {
|
| + if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
|
| if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {
|
| // Metro mode, add the 'Relaunch Chrome in desktop mode'.
|
| AddSeparator(ui::NORMAL_SEPARATOR);
|
| @@ -580,18 +577,6 @@ void WrenchMenuModel::Build() {
|
| AddItemWithStringId(IDC_WIN8_METRO_RESTART, IDS_WIN8_METRO_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
|
|
|