ui/events/gesture_detection/gesture_config_helper_aura.cc - Issue 393953012: Eager Gesture Recognition on Aura

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: ui/events/gesture_detection/gesture_config_helper_aura.cc

Issue 393953012: Eager Gesture Recognition on Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Jared's comments, and fix some compilation issues. Created 6 years, 5 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:

Index: ui/events/gesture_detection/gesture_config_helper_aura.cc

diff --git a/ui/events/gesture_detection/gesture_config_helper_aura.cc b/ui/events/gesture_detection/gesture_config_helper_aura.cc

index 9b751727c722d6765a7f92ccabff0128dd3bbb8f..c6c18f7c846f5d0a50647e8ebc8f03fa67b3e920 100644

--- a/ui/events/gesture_detection/gesture_config_helper_aura.cc

+++ b/ui/events/gesture_detection/gesture_config_helper_aura.cc

@@ -67,7 +67,10 @@ ScaleGestureDetector::Config DefaultScaleGestureDetectorConfig() {

GestureProvider::Config DefaultGestureProviderConfig() {

GestureProvider::Config config;

- config.display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();

+ gfx::Screen* screen = gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE);

+ // |screen| is sometimes NULL during tests.

+ if (screen)

+ config.display = screen->GetPrimaryDisplay();

config.gesture_detector_config = DefaultGestureDetectorConfig();

config.scale_gesture_detector_config = DefaultScaleGestureDetectorConfig();

config.gesture_begin_end_types_enabled = true;