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

Unified Diff: ui/aura/test/event_generator_delegate_aura.cc

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/accessibility/platform/atk_util_auralinux.cc ('k') | ui/base/clipboard/clipboard_aurax11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/event_generator_delegate_aura.cc
diff --git a/ui/aura/test/event_generator_delegate_aura.cc b/ui/aura/test/event_generator_delegate_aura.cc
index fd2ca205e17c7c1267e8f173e184730625682519..f248cb6da9c01d161a56b33f569a06ba24b854a0 100644
--- a/ui/aura/test/event_generator_delegate_aura.cc
+++ b/ui/aura/test/event_generator_delegate_aura.cc
@@ -16,7 +16,7 @@ namespace {
class DefaultEventGeneratorDelegate : public EventGeneratorDelegateAura {
public:
static DefaultEventGeneratorDelegate* GetInstance() {
- return Singleton<DefaultEventGeneratorDelegate>::get();
+ return base::Singleton<DefaultEventGeneratorDelegate>::get();
}
// EventGeneratorDelegate:
@@ -37,7 +37,7 @@ class DefaultEventGeneratorDelegate : public EventGeneratorDelegateAura {
}
private:
- friend struct DefaultSingletonTraits<DefaultEventGeneratorDelegate>;
+ friend struct base::DefaultSingletonTraits<DefaultEventGeneratorDelegate>;
DefaultEventGeneratorDelegate() : root_window_(NULL) {
DCHECK(!ui::test::EventGenerator::default_delegate);
« no previous file with comments | « ui/accessibility/platform/atk_util_auralinux.cc ('k') | ui/base/clipboard/clipboard_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698