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

Unified Diff: ui/chromeos/ime/input_method_menu_manager.h

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/base/x/x11_util.cc ('k') | ui/chromeos/ime/input_method_menu_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/chromeos/ime/input_method_menu_manager.h
diff --git a/ui/chromeos/ime/input_method_menu_manager.h b/ui/chromeos/ime/input_method_menu_manager.h
index 3c3ddb4380a30f0ed02d4558ea869eb6ab07d569..65427b7c3ccd5ab1b6c2354536ef3ef7c961a807 100644
--- a/ui/chromeos/ime/input_method_menu_manager.h
+++ b/ui/chromeos/ime/input_method_menu_manager.h
@@ -9,7 +9,10 @@
#ifndef UI_CHROMEOS_IME_INPUT_METHOD_MENU_MANAGER_H_
#define UI_CHROMEOS_IME_INPUT_METHOD_MENU_MANAGER_H_
-template<typename Type> struct DefaultSingletonTraits;
+namespace base {
+template <typename Type>
+struct DefaultSingletonTraits;
+} // namespace base
namespace ui {
namespace ime {
@@ -47,7 +50,7 @@ public:
InputMethodMenuManager();
// For Singleton to be able to construct an instance.
- friend struct DefaultSingletonTraits<InputMethodMenuManager>;
+ friend struct base::DefaultSingletonTraits<InputMethodMenuManager>;
// Menu item list of the input method. This is set by extension IMEs.
InputMethodMenuItemList menu_list_;
« no previous file with comments | « ui/base/x/x11_util.cc ('k') | ui/chromeos/ime/input_method_menu_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698