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

Unified Diff: content/renderer/render_widget.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 | « content/renderer/media/webrtc_uma_histograms.cc ('k') | crypto/capi_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 689b5769a6c1ded5032cbbf025f9bfd16dc4cf3f..8997a58307d4207416a25d7e8cc9e1a9b69e6467 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -121,7 +121,7 @@ typedef std::map<std::string, ui::TextInputMode> TextInputModeMap;
class TextInputModeMapSingleton {
public:
static TextInputModeMapSingleton* GetInstance() {
- return Singleton<TextInputModeMapSingleton>::get();
+ return base::Singleton<TextInputModeMapSingleton>::get();
}
TextInputModeMapSingleton() {
map_["verbatim"] = ui::TEXT_INPUT_MODE_VERBATIM;
@@ -140,7 +140,7 @@ class TextInputModeMapSingleton {
private:
TextInputModeMap map_;
- friend struct DefaultSingletonTraits<TextInputModeMapSingleton>;
+ friend struct base::DefaultSingletonTraits<TextInputModeMapSingleton>;
DISALLOW_COPY_AND_ASSIGN(TextInputModeMapSingleton);
};
« no previous file with comments | « content/renderer/media/webrtc_uma_histograms.cc ('k') | crypto/capi_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698