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

ash/wm/gestures/bezel_gesture_handler.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 "ash/wm/gestures/bezel_gesture_handler.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
@@ skipping 142 matching lines @@
     return false;
   }
 
   // No further notifications for this gesture.
   return true;
 }
 
 void BezelGestureHandler::HandleBezelGestureStart(
     aura::Window* target,
     const ui::GestureEvent& event) {
-  gfx::Rect screen = gfx::Screen::GetDisplayNearestWindow(target).bounds();
+  gfx::Rect screen =
+      Shell::GetScreen()->GetDisplayNearestWindow(target).bounds();
   int overlap_area = screen.width() * overlap_percent_ / 100;
   orientation_ = SCROLL_ORIENTATION_UNSET;
 
   if (event.x() <= screen.x() + overlap_area) {
     start_location_ = BEZEL_START_LEFT;
   } else if (event.x() >= screen.right() - overlap_area) {
     start_location_ = BEZEL_START_RIGHT;
   } else if (event.y() >= screen.bottom()) {
     start_location_ = BEZEL_START_BOTTOM;
   }
@@ skipping 33 matching lines @@
   } else {
     if (start_location_ == BEZEL_START_BOTTOM) {
       if (HandleLauncherControl(event))
         start_location_ = BEZEL_START_UNSET;
     } else {
       // Check if device gestures should be performed or not.
       if (!enable_bezel_device_control_) {
         start_location_ = BEZEL_START_UNSET;
         return;
       }
-      gfx::Rect screen = gfx::Screen::GetDisplayNearestWindow(target).bounds();
+      gfx::Rect screen =
+          Shell::GetScreen()->GetDisplayNearestWindow(target).bounds();
       // Limit the user gesture "mostly" to the off screen area and check for
       // noise invocation.
       if (!GestureInBezelArea(screen, event) ||
           BezelGestureMightBeNoise(screen, event))
         return;
       if (HandleDeviceControl(screen, event))
         start_location_ = BEZEL_START_UNSET;
     }
   }
 }
@@ skipping 56 matching lines @@
   // Turning off the display makes no sense, so we map the accessible range to
   // kMinimumBrightness .. 100%.
   percent = (percent + kMinBrightnessPercent) * 100.0 /
       (100.0 + kMinBrightnessPercent);
   // Clamp to avoid rounding issues.
   return std::min(percent, 100.0);
 }
 
 }  // namespace internal
 }  // namespace ash