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

chrome/browser/ui/views/chrome_views_delegate.cc

Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 4f484b9988b323f96cbae598f4a29c4eea5244bc..e9a26c562da319370f26b6033bb0efacbfb8f392 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/views/accessibility/accessibility_event_router_views.h"
 #include "chrome/common/pref_names.h"
 #include "ui/gfx/rect.h"
@@ -30,7 +31,9 @@
 #endif
 
 #if defined(USE_AURA)
+#include "ui/aura/window.h"
 #include "ui/views/widget/desktop_native_widget_helper_aura.h"
+#include "ui/views/widget/native_widget_aura.h"
 #endif
 
 #if defined(USE_ASH)
@@ -79,7 +82,8 @@ void ChromeViewsDelegate::SaveWindowPlacement(const views::Widget* window,
   window_preferences->SetBoolean("maximized",
                                  show_state == ui::SHOW_STATE_MAXIMIZED);
   gfx::Rect work_area(
-      gfx::Screen::GetDisplayMatching(bounds).work_area());
+      gfx::Screen::GetDisplayMatching(
+          gfx::Screen::BadTwoWorldsContext(), bounds).work_area());
   window_preferences->SetInteger("work_area_left", work_area.x());
   window_preferences->SetInteger("work_area_top", work_area.y());
   window_preferences->SetInteger("work_area_right", work_area.right());
@@ -144,13 +148,9 @@ views::NonClientFrameView* ChromeViewsDelegate::CreateDefaultNonClientFrameView(
 }
 
 bool ChromeViewsDelegate::UseTransparentWindows() const {
-#if defined(USE_ASH)
-  // Ash uses transparent window frames above.
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      views::switches::kDesktopAura);
-#else
+  // TODO(scottmg): http://crbug.com/133312
+  NOTIMPLEMENTED();
   return false;
-#endif
 }
 
 void ChromeViewsDelegate::AddRef() {
@@ -167,17 +167,11 @@ int ChromeViewsDelegate::GetDispositionForEvent(int event_flags) {
 
 #if defined(USE_AURA)
 views::NativeWidgetHelperAura* ChromeViewsDelegate::CreateNativeWidgetHelper(
-    views::NativeWidgetAura* native_widget) {
-  // TODO(beng): insufficient but currently necessary. http://crbug.com/133312
-#if !defined(OS_CHROMEOS)  // We don't build this class for ChromeOS.
-#if defined(USE_ASH)
-  if (!chrome::ShouldOpenAshOnStartup())
-#endif
+    views::NativeWidgetAura* native_widget, gfx::NativeView parent) {
+  if (chrome::GetHostDesktopTypeForNativeView(parent) ==
+      chrome::HOST_DESKTOP_TYPE_NATIVE)
     return new views::DesktopNativeWidgetHelperAura(native_widget);
-#endif
-#if defined(USE_ASH)
   return NULL;
-#endif
 }
 #endif
 
@@ -190,9 +184,9 @@ content::WebContents* ChromeViewsDelegate::CreateWebContents(
 views::NativeWidget* ChromeViewsDelegate::CreateNativeWidget(
     views::internal::NativeWidgetDelegate* delegate,
     gfx::NativeView parent) {
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-        views::switches::kDesktopAura))
+#if defined(USE_AURA)
+  if (chrome::GetHostDesktopTypeForNativeView(parent) ==
+      chrome::HOST_DESKTOP_TYPE_NATIVE)
     return new views::DesktopNativeWidgetAura(delegate);
 #endif
   return NULL;