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

content/shell/shell_aura.cc

Index: content/shell/shell_aura.cc
diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc
index ebbd75eaf30b1c217cbf339e525d16b94bee4e00..1d39615408c35b4cfa14892f2bc0c8c75234b5d1 100644
--- a/content/shell/shell_aura.cc
+++ b/content/shell/shell_aura.cc
@@ -55,7 +55,7 @@ class ShellViewsDelegateAura : public views::TestViewsDelegate {
     return use_transparent_windows_;
   }
   virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper(
-      views::NativeWidgetAura* native_widget) OVERRIDE {
+      views::NativeWidgetAura* native_widget, gfx::NativeView parent) OVERRIDE {
     return new views::DesktopNativeWidgetHelperAura(native_widget);
   }
 
@@ -289,7 +289,8 @@ void Shell::PlatformInitialize() {
 #endif
   aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);
   stacking_client_ = new aura::DesktopStackingClient();
-  gfx::Screen::SetInstance(aura::CreateDesktopScreen());
+  gfx::Screen::SetScreenInstance(
+      gfx::SCREEN_TYPE_NATIVE, aura::CreateDesktopScreen());
   views_delegate_ = new ShellViewsDelegateAura();
 
   CommandLine::ForCurrentProcess()->AppendSwitch(views::switches::kDesktopAura);