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

chrome/browser/ui/toolbar/wrench_menu_model.cc

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 a925c1fda190693ea7e6e0311a3620d075502304..086a7825883120c920029974d5e493d3cc165461 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -501,13 +501,11 @@ void WrenchMenuModel::Build() {
 
 #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_));