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; |