| 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 1434be1f78f7414719f3162b40dd65271c5f7add..164f3c9e2f53ef36753f5c7820606a069b73b98c 100644
|
| --- a/ui/events/gesture_detection/gesture_config_helper_aura.cc
|
| +++ b/ui/events/gesture_detection/gesture_config_helper_aura.cc
|
| @@ -9,7 +9,6 @@
|
| #include "base/command_line.h"
|
| #include "ui/events/event_switches.h"
|
| #include "ui/events/gestures/gesture_configuration.h"
|
| -#include "ui/gfx/screen.h"
|
|
|
| namespace ui {
|
| namespace {
|
| @@ -57,10 +56,6 @@ ScaleGestureDetector::Config DefaultScaleGestureDetectorConfig() {
|
|
|
| GestureProvider::Config DefaultGestureProviderConfig() {
|
| GestureProvider::Config config;
|
| - 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;
|
|
|