ash/wm/gestures/long_press_affordance_handler.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/gestures/long_press_affordance_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 some new gfx::Screen additions 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

Index: ash/wm/gestures/long_press_affordance_handler.cc

diff --git a/ash/wm/gestures/long_press_affordance_handler.cc b/ash/wm/gestures/long_press_affordance_handler.cc

index 328c0ad4f53d866939039e7119983368ad371f67..22b61055f39d363d2644471366391aa4ba83efd0 100644

--- a/ash/wm/gestures/long_press_affordance_handler.cc

+++ b/ash/wm/gestures/long_press_affordance_handler.cc

@@ -261,7 +261,8 @@ void LongPressAffordanceHandler::ProcessEvent(aura::Window* target,

tap_down_location_ = event->root_location();

tap_down_touch_id_ = touch_id;

current_animation_type_ = GROW_ANIMATION;

- tap_down_display_id_ = gfx::Screen::GetDisplayNearestWindow(target).id();

+ tap_down_display_id_ =

+ Shell::GetAshScreen()->GetDisplayNearestWindow(target).id();

timer_.Start(FROM_HERE,

base::TimeDelta::FromMilliseconds(timer_start_time_ms),

this,

« ash/system/tray/system_tray.cc ('K') | « ash/wm/gestures/bezel_gesture_handler.cc ('k') | ash/wm/maximize_bubble_controller.cc » ('j') | ash/wm/shelf_layout_manager.cc » ('J')