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

Unified Diff: ui/base/clipboard/clipboard_aurax11.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/aura/test/event_generator_delegate_aura.cc ('k') | ui/base/ime/input_method_auralinux_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_aurax11.cc
diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc
index de56858dffc786d21baf0ec03285ade20e03e69c..b9b53f18f365917589b8b64d8b4c6ab0dec78df8 100644
--- a/ui/base/clipboard/clipboard_aurax11.cc
+++ b/ui/base/clipboard/clipboard_aurax11.cc
@@ -71,7 +71,7 @@ class SelectionChangeObserver : public ui::PlatformEventObserver {
uint64 primary_sequence_number() const { return primary_sequence_number_; }
private:
- friend struct DefaultSingletonTraits<SelectionChangeObserver>;
+ friend struct base::DefaultSingletonTraits<SelectionChangeObserver>;
SelectionChangeObserver();
~SelectionChangeObserver() override;
@@ -119,7 +119,7 @@ SelectionChangeObserver::~SelectionChangeObserver() {
}
SelectionChangeObserver* SelectionChangeObserver::GetInstance() {
- return Singleton<SelectionChangeObserver>::get();
+ return base::Singleton<SelectionChangeObserver>::get();
}
void SelectionChangeObserver::WillProcessEvent(const ui::PlatformEvent& event) {
« no previous file with comments | « ui/aura/test/event_generator_delegate_aura.cc ('k') | ui/base/ime/input_method_auralinux_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698