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

ui/views/examples/content_client/examples_browser_main_parts.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 "ui/views/examples/content_client/examples_browser_main_parts.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 40 matching lines @@
 
 ExamplesBrowserMainParts::~ExamplesBrowserMainParts() {
 }
 
 void ExamplesBrowserMainParts::PreMainMessageLoopRun() {
   browser_context_.reset(new content::ShellBrowserContext(false));
 
 #if defined(USE_AURA)
   aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);
   stacking_client_.reset(new aura::DesktopStackingClient);
-  gfx::Screen::SetInstance(aura::CreateDesktopScreen());
+  gfx::Screen::SetScreenInstance(
+      gfx::SCREEN_TYPE_NATIVE, aura::CreateDesktopScreen());
 #endif
   views_delegate_.reset(new ExamplesViewsDelegate);
 
   ShowExamplesWindowWithContent(QUIT_ON_CLOSE, browser_context_.get());
 }
 
 void ExamplesBrowserMainParts::PostMainMessageLoopRun() {
   browser_context_.reset();
   views_delegate_.reset();
 #if defined(USE_AURA)
   stacking_client_.reset();
   aura::Env::DeleteInstance();
 #endif
 }
 
 bool ExamplesBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // xxx: Hax here because this kills event handling.
 #if !defined(USE_AURA)
   AcceleratorHandler accelerator_handler;
   base::RunLoop run_loop(&accelerator_handler);
 #else
   base::RunLoop run_loop;
 #endif
   run_loop.Run();
   return true;
 }
 
 }  // namespace examples
 }  // namespace views