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

chrome/browser/speech/speech_recognition_bubble.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/speech/speech_recognition_bubble.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 112 matching lines @@
 
   return CreateNativeBubble(web_contents, delegate, element_rect);
 }
 
 SpeechRecognitionBubbleBase::SpeechRecognitionBubbleBase(
     WebContents* web_contents)
     : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       display_mode_(DISPLAY_MODE_RECORDING),
       web_contents_(web_contents),
       scale_factor_(ui::SCALE_FACTOR_NONE) {
-  gfx::Display display = gfx::Screen::GetDisplayNearestWindow(
-      web_contents_ ? web_contents_->GetNativeView() : NULL);
+  gfx::NativeView view = web_contents_ ? web_contents_->GetNativeView() : NULL;
+  gfx::Screen* screen = gfx::Screen::GetScreenFor(view);
+  gfx::Display display = screen->GetDisplayNearestWindow(view);
   scale_factor_ = ui::GetScaleFactorFromScale(
       display.device_scale_factor());
 
   const gfx::ImageSkiaRep& rep =
       g_images.Get().mic_empty()->GetRepresentation(scale_factor_);
   mic_image_.reset(new SkBitmap());
   mic_image_->setConfig(SkBitmap::kARGB_8888_Config,
       rep.pixel_width(), rep.pixel_height());
   mic_image_->allocPixels();
 
@@ skipping 111 matching lines @@
 }
 
 void SpeechRecognitionBubbleBase::SetImage(const gfx::ImageSkia& image) {
   icon_image_.reset(new gfx::ImageSkia(image));
   UpdateImage();
 }
 
 gfx::ImageSkia SpeechRecognitionBubbleBase::icon_image() {
   return (icon_image_ != NULL) ? *icon_image_ : gfx::ImageSkia();
 }