Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Unified Diff: ui/events/gesture_detection/gesture_configuration_default.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/gesture_detection/gesture_configuration_android.cc ('k') | ui/events/x/events_x.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gesture_detection/gesture_configuration_default.cc
diff --git a/ui/events/gesture_detection/gesture_configuration_default.cc b/ui/events/gesture_detection/gesture_configuration_default.cc
index 5442ad027be03f30fa84cf17b57a34325fa4aa55..b279ace49c9ebeaa64736a1efdcde73c2add29b8 100644
--- a/ui/events/gesture_detection/gesture_configuration_default.cc
+++ b/ui/events/gesture_detection/gesture_configuration_default.cc
@@ -15,13 +15,13 @@ class GestureConfigurationDefault : public GestureConfiguration {
}
static GestureConfigurationDefault* GetInstance() {
- return Singleton<GestureConfigurationDefault>::get();
+ return base::Singleton<GestureConfigurationDefault>::get();
}
private:
GestureConfigurationDefault() {}
- friend struct DefaultSingletonTraits<GestureConfigurationDefault>;
+ friend struct base::DefaultSingletonTraits<GestureConfigurationDefault>;
DISALLOW_COPY_AND_ASSIGN(GestureConfigurationDefault);
};
« no previous file with comments | « ui/events/gesture_detection/gesture_configuration_android.cc ('k') | ui/events/x/events_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698