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

chrome/browser/ui/views/chrome_views_delegate.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/views/chrome_views_delegate.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/event_disposition.h"
 #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"
 #include "ui/gfx/screen.h"
 #include "ui/views/views_switches.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/app_icon_win.h"
 #endif
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_native_widget_aura.h"
 #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)
 #include "ash/shell.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #endif
 
 namespace {
 
 // If the given window has a profile associated with it, use that profile's
@@ skipping 28 matching lines @@
   DCHECK(prefs->FindPreference(window_name.c_str()));
   DictionaryPrefUpdate update(prefs, window_name.c_str());
   DictionaryValue* window_preferences = update.Get();
   window_preferences->SetInteger("left", bounds.x());
   window_preferences->SetInteger("top", bounds.y());
   window_preferences->SetInteger("right", bounds.right());
   window_preferences->SetInteger("bottom", bounds.bottom());
   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());
   window_preferences->SetInteger("work_area_bottom", work_area.bottom());
 }
 
 bool ChromeViewsDelegate::GetSavedWindowPlacement(
     const std::string& window_name,
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
@@ skipping 44 matching lines @@
 views::NonClientFrameView* ChromeViewsDelegate::CreateDefaultNonClientFrameView(
     views::Widget* widget) {
 #if defined(USE_ASH)
   return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget);
 #else
   return NULL;
 #endif
 }
 
 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() {
   g_browser_process->AddRefModule();
 }
 
 void ChromeViewsDelegate::ReleaseRef() {
   g_browser_process->ReleaseModule();
 }
 
 int ChromeViewsDelegate::GetDispositionForEvent(int event_flags) {
   return chrome::DispositionFromEventFlags(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
 
 content::WebContents* ChromeViewsDelegate::CreateWebContents(
     content::BrowserContext* browser_context,
     content::SiteInstance* site_instance) {
   return NULL;
 }
 
 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;
 }