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

chrome/browser/tab_contents/thumbnail_generator.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/tab_contents/thumbnail_generator.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 110 matching lines @@
       break;
   }
   return copy_size;
 }
 
 // Returns the size of the thumbnail stored in the database in pixel.
 gfx::Size GetThumbnailSizeInPixel() {
   gfx::Size thumbnail_size(kThumbnailWidth, kThumbnailHeight);
   // Determine the resolution of the thumbnail based on the primary monitor.
   // TODO(oshima): Use device's default scale factor.
-  gfx::Display primary_display = gfx::Screen::GetPrimaryDisplay();
+  gfx::Display primary_display = gfx::Screen::GetPrimaryDisplay(
+      gfx::Screen::BadTwoWorldsContext());
   return thumbnail_size.Scale(primary_display.device_scale_factor());
 }
 
 // Returns the clipping rectangle that is used for creating a thumbnail with
 // the size of |desired_size| from the bitmap with the size of |source_size|.
 // The type of clipping that needs to be done is assigned to |clip_result|.
 gfx::Rect GetClippingRect(const gfx::Size& source_size,
                           const gfx::Size& desired_size,
                           ThumbnailGenerator::ClipResult* clip_result) {
   DCHECK(clip_result);
@@ skipping 495 matching lines @@
 void ThumbnailGenerator::DidStartLoading(
     content::RenderViewHost* render_view_host) {
   load_interrupted_ = false;
 }
 
 void ThumbnailGenerator::StopNavigation() {
   // This function gets called when the page loading is interrupted by the
   // stop button.
   load_interrupted_ = true;
 }