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

Unified Diff: content/common/font_cache_dispatcher_win.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/child/child_io_surface_manager_mac.cc ('k') | content/common/sandbox_linux/sandbox_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/font_cache_dispatcher_win.cc
diff --git a/content/common/font_cache_dispatcher_win.cc b/content/common/font_cache_dispatcher_win.cc
index e7d9eff5326025da69d0849fc838712a4dddc206..49ff631672a61b310b30a6406f4b8275531ca91b 100644
--- a/content/common/font_cache_dispatcher_win.cc
+++ b/content/common/font_cache_dispatcher_win.cc
@@ -19,9 +19,7 @@ typedef std::map<FontCacheDispatcher*, FontNameVector> DispatcherToFontNames;
class FontCache {
public:
- static FontCache* GetInstance() {
- return Singleton<FontCache>::get();
- }
+ static FontCache* GetInstance() { return base::Singleton<FontCache>::get(); }
void PreCacheFont(const LOGFONT& font, FontCacheDispatcher* dispatcher) {
// TODO(ananta): Remove ScopedTracker below once crbug.com/90127 is fixed.
@@ -123,7 +121,7 @@ class FontCache {
HDC dc_;
int ref_count_;
};
- friend struct DefaultSingletonTraits<FontCache>;
+ friend struct base::DefaultSingletonTraits<FontCache>;
FontCache() {
}
« no previous file with comments | « content/child/child_io_surface_manager_mac.cc ('k') | content/common/sandbox_linux/sandbox_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698