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..d1a8610aa1d93f713007a4a4ebf37ea121e9c996 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -79,7 +79,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());

[oshima, 2012/10/04 20:18:26]

shouldn't this be |window|?

   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());
@@ -167,7 +168,7 @@ int ChromeViewsDelegate::GetDispositionForEvent(int event_flags) {
 
 #if defined(USE_AURA)
 views::NativeWidgetHelperAura* ChromeViewsDelegate::CreateNativeWidgetHelper(
-    views::NativeWidgetAura* native_widget) {
+    views::NativeWidgetAura* native_widget, gfx::NativeView parent) {
   // 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)