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

chrome/browser/ui/aura/chrome_browser_main_extra_parts_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 "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h"
 
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/toolkit_extra_parts.h"
 #include "ui/aura/env.h"
 
@@ skipping 11 matching lines @@
 #endif  // !USE_ASH
 
 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() {
 }
 
 ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() {
 }
 
 void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
 #if !defined(USE_ASH)
-  gfx::Screen::SetInstance(aura::CreateDesktopScreen());
+  gfx::Screen::SetScreenInstance(
+      gfx::SCREEN_TYPE_NATIVE, aura::CreateDesktopScreen());
   aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);
   stacking_client_.reset(new aura::DesktopStackingClient);
 #endif  // !USE_ASH
 
 #if !defined(USE_ASH) && defined(OS_LINUX)
   // TODO(erg): Refactor this into a dlopen call when we add a GTK3 port.
   ui::LinuxUI::SetInstance(BuildGtk2UI());
 #endif
 }
 
 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
 #if !defined(USE_ASH)
   stacking_client_.reset();
 #endif
 
   // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown
   // after the metrics service is deleted.
 }
 
 namespace chrome {
 
 void AddAuraToolkitExtraParts(ChromeBrowserMainParts* main_parts) {
   main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
 }
 
 }  // namespace chrome