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

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: Rebase. 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:
View side-by-side diff with in-line comments
Download patch
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..fa9d1ff07085359bbc35316c8dc9bb7bf7e8fe67 100644
--- a/ui/events/gesture_detection/gesture_config_helper_aura.cc
+++ b/ui/events/gesture_detection/gesture_config_helper_aura.cc
@@ -67,7 +67,9 @@ 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);
+ if (screen)
jdduke (slow) 2014/07/30 15:29:32 This is scary, when will this be null? Should we b
tdresser 2014/07/31 15:33:31 Added a comment indicating that |screen| is someti
+ config.display = screen->GetPrimaryDisplay();
config.gesture_detector_config = DefaultGestureDetectorConfig();
config.scale_gesture_detector_config = DefaultScaleGestureDetectorConfig();
config.gesture_begin_end_types_enabled = true;

Powered by Google App Engine
This is Rietveld 408576698