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

Unified Diff: ui/views/test/event_generator_delegate_mac.mm

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 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/views/focus/widget_focus_manager.cc ('k') | ui/views/widget/desktop_aura/x11_desktop_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/event_generator_delegate_mac.mm
diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm
index 4e4a32b2237f48ba26faa325af59c772801eabf5..1ec6016df0c37f56d764c93d8eb80212e903ad35 100644
--- a/ui/views/test/event_generator_delegate_mac.mm
+++ b/ui/views/test/event_generator_delegate_mac.mm
@@ -224,7 +224,7 @@ class EventGeneratorDelegateMac : public ui::EventTarget,
public ui::test::EventGeneratorDelegate {
public:
static EventGeneratorDelegateMac* GetInstance() {
- return Singleton<EventGeneratorDelegateMac>::get();
+ return base::Singleton<EventGeneratorDelegateMac>::get();
}
IMP CurrentEventMethod() {
@@ -285,7 +285,7 @@ class EventGeneratorDelegateMac : public ui::EventTarget,
gfx::Point* point) const override {}
private:
- friend struct DefaultSingletonTraits<EventGeneratorDelegateMac>;
+ friend struct base::DefaultSingletonTraits<EventGeneratorDelegateMac>;
EventGeneratorDelegateMac();
~EventGeneratorDelegateMac() override;
« no previous file with comments | « ui/views/focus/widget_focus_manager.cc ('k') | ui/views/widget/desktop_aura/x11_desktop_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698