Add context to gfx::Screen calls in support of simultaneous desktop+ash

chrome/browser/ui/toolbar/wrench_menu_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 483 matching lines @@
   AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
 #if defined(OS_CHROMEOS)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession))
     AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
 #else
   AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
 #endif
 
 #endif  // else of defined(OS_WIN)
 
-#if defined(USE_ASH)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAsh)) {
-    if (!ash::Shell::HasInstance())
-      AddItemWithStringId(IDC_TOGGLE_ASH_DESKTOP, IDS_OPEN_ASH_DESKTOP);
-    else
-      AddItemWithStringId(IDC_TOGGLE_ASH_DESKTOP, IDS_CLOSE_ASH_DESKTOP);
-  }
+#if defined(USE_AURA) && defined(OS_WIN)
+  if (!ash::Shell::HasInstance())
+    AddItemWithStringId(IDC_TOGGLE_ASH_DESKTOP, IDS_OPEN_ASH_DESKTOP);
+  else
+    AddItemWithStringId(IDC_TOGGLE_ASH_DESKTOP, IDS_CLOSE_ASH_DESKTOP);
 #endif
 
   bookmark_sub_menu_model_.reset(new BookmarkSubMenuModel(this, browser_));
   AddSubMenuWithStringId(IDC_BOOKMARKS_MENU, IDS_BOOKMARKS_MENU,
                          bookmark_sub_menu_model_.get());
 
 #if defined(OS_WIN)
   if (base::win::IsMetroProcess()) {
     // Metro mode, add the 'Relaunch Chrome in desktop mode'.
     AddSeparator(ui::SPACING_SEPARATOR);
@@ skipping 198 matching lines @@
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   Profile* profile = browser_->profile()->GetOriginalProfile();
   return sync_ui_util::GetSyncMenuLabel(
       ProfileSyncServiceFactory::GetForProfile(profile),
       *SigninManagerFactory::GetForProfile(profile));
 }