| Index: ui/events/gesture_detection/gesture_configuration_default.cc
|
| diff --git a/ui/events/gesture_detection/gesture_config_helper.cc b/ui/events/gesture_detection/gesture_configuration_default.cc
|
| similarity index 59%
|
| rename from ui/events/gesture_detection/gesture_config_helper.cc
|
| rename to ui/events/gesture_detection/gesture_configuration_default.cc
|
| index 0039e2c1f931f834b0bbfadf76a18991af82e141..ba27683bcf21003b9767a793f725371ea82db305 100644
|
| --- a/ui/events/gesture_detection/gesture_config_helper.cc
|
| +++ b/ui/events/gesture_detection/gesture_configuration_default.cc
|
| @@ -1,13 +1,17 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ui/events/gesture_detection/gesture_config_helper.h"
|
| +#include "ui/events/gesture_detection/gesture_configuration.h"
|
|
|
| #include "ui/gfx/screen.h"
|
|
|
| namespace ui {
|
|
|
| +GestureConfiguration* GestureConfiguration::GetInstance() {
|
| + return Singleton<GestureConfiguration>::get();
|
| +}
|
| +
|
| GestureProvider::Config DefaultGestureProviderConfig() {
|
| GestureProvider::Config config;
|
| config.display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
|
|
|