ui/events/gesture_detection/gesture_configuration_android.cc - Issue 1308823002: Move Singleton and related structs to namespace base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/events/gesture_detection/gesture_configuration_android.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix more errors Created 5 years, 4 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

« ios/chrome/browser/favicon/favicon_service_factory.h ('K') | « ui/events/devices/x11/touch_factory_x11.cc ('k') | ui/events/gesture_detection/gesture_configuration_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/events/gesture_detection/gesture_configuration_android.cc

diff --git a/ui/events/gesture_detection/gesture_configuration_android.cc b/ui/events/gesture_detection/gesture_configuration_android.cc

index 4a81915da19dfb825b76bd74f44093f5718de1cd..51cbfa9f486e64fdab02c4f61cf32e64bc51b631 100644

--- a/ui/events/gesture_detection/gesture_configuration_android.cc

+++ b/ui/events/gesture_detection/gesture_configuration_android.cc

@@ -26,7 +26,7 @@ class GestureConfigurationAndroid : public GestureConfiguration {

}

static GestureConfigurationAndroid* GetInstance() {

- return Singleton<GestureConfigurationAndroid>::get();

+ return base::Singleton<GestureConfigurationAndroid>::get();

}

private:

@@ -60,7 +60,7 @@ class GestureConfigurationAndroid : public GestureConfiguration {

ViewConfiguration::GetLongPressTimeoutInMs());

}

- friend struct DefaultSingletonTraits<GestureConfigurationAndroid>;

+ friend struct base::DefaultSingletonTraits<GestureConfigurationAndroid>;

DISALLOW_COPY_AND_ASSIGN(GestureConfigurationAndroid);

};