Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(421)

Unified Diff: ash/wm/gestures/bezel_gesture_handler.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix new addition Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/frame_painter_unittest.cc ('k') | ash/wm/gestures/long_press_affordance_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/gestures/bezel_gesture_handler.cc
diff --git a/ash/wm/gestures/bezel_gesture_handler.cc b/ash/wm/gestures/bezel_gesture_handler.cc
index eb43de8f6872e3433a9c47920032b232e292f1d1..1d82223323b3ce9d88e5585f19ddfeaef1045a81 100644
--- a/ash/wm/gestures/bezel_gesture_handler.cc
+++ b/ash/wm/gestures/bezel_gesture_handler.cc
@@ -160,7 +160,8 @@ bool BezelGestureHandler::HandleApplicationControl(
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;
@@ -214,7 +215,8 @@ void BezelGestureHandler::HandleBezelGestureUpdate(
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) ||
« no previous file with comments | « ash/wm/frame_painter_unittest.cc ('k') | ash/wm/gestures/long_press_affordance_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698