ui/events/gesture_detection/gesture_configuration_android.cc - Issue 2050943002: Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

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 2050943002: Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 4 years, 6 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:

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 2cf29aa643a5923daf7ab94b62aa226428ddcf12..8616e0e070cbc74b2da33a5b3bb8d5267aef9fa1 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:

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

raw_pixel_to_dip_ratio);

}

- friend struct DefaultSingletonTraits<GestureConfigurationAndroid>;

+ friend struct base::DefaultSingletonTraits<GestureConfigurationAndroid>;

DISALLOW_COPY_AND_ASSIGN(GestureConfigurationAndroid);

};