ui/gfx/font_fallback_win.cc - Issue 1308823002: Move Singleton and related structs to namespace base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/font_fallback_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

Index: ui/gfx/font_fallback_win.cc

diff --git a/ui/gfx/font_fallback_win.cc b/ui/gfx/font_fallback_win.cc

index ecb85aeab9e7a6c947df0fb4ee5b67e9ad14f60e..1612f3c72194b4defe7396ff71572fe9971e6dc1 100644

--- a/ui/gfx/font_fallback_win.cc

+++ b/ui/gfx/font_fallback_win.cc

@@ -113,7 +113,7 @@ class CachedFontLinkSettings {

const std::vector<Font>* GetLinkedFonts(const Font& font);

private:

- friend struct DefaultSingletonTraits<CachedFontLinkSettings>;

+ friend struct base::DefaultSingletonTraits<CachedFontLinkSettings>;

CachedFontLinkSettings();

virtual ~CachedFontLinkSettings();

@@ -129,8 +129,9 @@ class CachedFontLinkSettings {

// static

CachedFontLinkSettings* CachedFontLinkSettings::GetInstance() {

- return Singleton<CachedFontLinkSettings,

- LeakySingletonTraits<CachedFontLinkSettings> >::get();

+ return base::Singleton<

+ CachedFontLinkSettings,

+ base::LeakySingletonTraits<CachedFontLinkSettings>>::get();

}

const std::vector<Font>* CachedFontLinkSettings::GetLinkedFonts(

« no previous file with comments | « ui/gfx/android/shared_device_display_info.cc ('k') | ui/gfx/font_render_params_win.cc » ('j') | no next file with comments »