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

chrome/browser/ui/panels/display_settings_provider.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/panels/display_settings_provider.h"
 
 #include "base/logging.h"
 #include "chrome/browser/fullscreen.h"
 #include "ui/gfx/screen.h"
 
@@ skipping 51 matching lines @@
 
 gfx::Rect DisplaySettingsProvider::GetDisplayArea() {
   // Do the first-time initialization if not yet.
   if (adjusted_work_area_.IsEmpty())
     OnDisplaySettingsChanged();
 
   return adjusted_work_area_;
 }
 
 gfx::Rect DisplaySettingsProvider::GetPrimaryScreenArea() const {
-  return gfx::Screen::GetPrimaryDisplay().bounds();
+  return gfx::Screen::GetPrimaryDisplay(
+      gfx::Screen::BadTwoWorldsContext()).bounds();
 }
 
 gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
 #if defined(OS_MACOSX)
   // On OSX, panels should be dropped all the way to the bottom edge of the
   // screen (and overlap Dock). And we also want to exclude the system menu
   // area. Note that the rect returned from gfx::Screen util functions is in
   // platform-independent screen coordinates with (0, 0) as the top-left corner.
   gfx::Display display = gfx::Screen::GetPrimaryDisplay();
   gfx::Rect display_area = display.bounds();
   gfx::Rect work_area = display.work_area();
   int system_menu_height = work_area.y() - display_area.y();
   if (system_menu_height > 0) {
     display_area.set_y(display_area.y() + system_menu_height);
     display_area.set_height(display_area.height() - system_menu_height);
   }
   return display_area;
 #else
-  gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
+  gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay(
+      gfx::Screen::BadTwoWorldsContext()).work_area();
 #endif
   return work_area;
 }
 
 void DisplaySettingsProvider::OnDisplaySettingsChanged() {
   gfx::Rect work_area = GetWorkArea();
   if (work_area == work_area_)
     return;
   work_area_ = work_area;
 
@@ skipping 65 matching lines @@
 bool DisplaySettingsProvider::IsFullScreen() const {
   return IsFullScreenMode();
 }
 
 #if defined(USE_AURA)
 // static
 DisplaySettingsProvider* DisplaySettingsProvider::Create() {
   return new DisplaySettingsProvider();
 }
 #endif