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"
@@ skipping 61 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::Rect work_area(gfx::Screen::GetScreenFor(window->GetNativeView())->
+      GetDisplayMatching(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 67 matching lines @@
 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) {
+    views::NativeWidgetAura* native_widget, gfx::NativeView parent) {

[Ben Goodger (Google), 2012/10/10 22:52:10]

given that you don't use this value here, I don't think you need to add this
param to this method or to NWA's ctor.

[scottmg, 2012/10/11 00:22:28]

Oops, thanks. I think that was from when this method was more complicated. Done.

 #if !defined(OS_CHROMEOS) && !defined(OS_WIN)
       // TODO(erg): get rid of this, it's interfering with desktop-aura.
   return new views::DesktopNativeWidgetHelperAura(native_widget);
 #else
   return NULL;
 #endif
 }
 #endif
 
 content::WebContents* ChromeViewsDelegate::CreateWebContents(
     content::BrowserContext* browser_context,
     content::SiteInstance* site_instance) {
   return NULL;
 }
 
 views::NativeWidget* ChromeViewsDelegate::CreateNativeWidget(
     views::Widget::InitParams::Type type,
     views::internal::NativeWidgetDelegate* delegate,
     gfx::NativeView parent) {
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
   if (parent && type != views::Widget::InitParams::TYPE_MENU)
-    return new views::NativeWidgetAura(delegate);
+    return new views::NativeWidgetAura(delegate, NULL);
   if (CommandLine::ForCurrentProcess()->HasSwitch(
         views::switches::kDesktopAura))
     return new views::DesktopNativeWidgetAura(delegate);
 #endif
   return NULL;
 }