| Index: ui/events/gesture_detection/gesture_configuration_aura.cc
|
| diff --git a/ui/events/gesture_detection/gesture_configuration_aura.cc b/ui/events/gesture_detection/gesture_configuration_aura.cc
|
| index d7e47c152aaf8636094a9f9d9cbeb8d82882e9e8..1ed2976ff9a2e559a1aff8aa8c6bfc2ab2511826 100644
|
| --- a/ui/events/gesture_detection/gesture_configuration_aura.cc
|
| +++ b/ui/events/gesture_detection/gesture_configuration_aura.cc
|
| @@ -17,7 +17,7 @@ class GestureConfigurationAura : public GestureConfiguration {
|
| }
|
|
|
| static GestureConfigurationAura* GetInstance() {
|
| - return Singleton<GestureConfigurationAura>::get();
|
| + return base::Singleton<GestureConfigurationAura>::get();
|
| }
|
|
|
| private:
|
| @@ -40,7 +40,7 @@ class GestureConfigurationAura : public GestureConfiguration {
|
| set_fling_touchscreen_tap_suppression_enabled(true);
|
| }
|
|
|
| - friend struct DefaultSingletonTraits<GestureConfigurationAura>;
|
| + friend struct base::DefaultSingletonTraits<GestureConfigurationAura>;
|
| DISALLOW_COPY_AND_ASSIGN(GestureConfigurationAura);
|
| };
|
|
|
|
|