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

content/shell/shell_aura.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 "content/shell/shell.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/desktop/desktop_screen.h"
 #include "ui/aura/desktop/desktop_stacking_client.h"
@@ skipping 37 matching lines @@
 
   void SetUseTransparentWindows(bool transparent) {
     use_transparent_windows_ = transparent;
   }
 
   // Overridden from views::TestViewsDelegate:
   virtual bool UseTransparentWindows() const OVERRIDE {
     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);
   }
 
  private:
   bool use_transparent_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegateAura);
 };
 
 // TODO(beng): This stuff should NOT be in the views namespace!
@@ skipping 213 matching lines @@
 aura::client::StackingClient* Shell::stacking_client_ = NULL;
 views::ViewsDelegate* Shell::views_delegate_ = NULL;
 
 // static
 void Shell::PlatformInitialize() {
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Initialize();
 #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);
 }
 
 void Shell::PlatformExit() {
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Shutdown();
 #endif
   if (stacking_client_)
@@ skipping 52 matching lines @@
 }
 
 void Shell::PlatformSetTitle(const string16& title) {
   ShellWindowDelegateView* delegate_view =
     static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate());
   delegate_view->SetWindowTitle(title);
   window_widget_->UpdateWindowTitle();
 }
 
 }  // namespace content