ui/base/resource/resource_bundle.cc - Issue 1130613002: Clean up Noto Sans UI stuff.

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/base/resource/resource_bundle.cc

Issue 1130613002: Clean up Noto Sans UI stuff. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address jshin@'s comments. Created 5 years, 7 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:

Index: ui/base/resource/resource_bundle.cc

diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc

index 755307c6ff2d3f234819b9efe942d03e9871c333..665b580a6d7253274442a4860e13ab7c67db7a32 100644

--- a/ui/base/resource/resource_bundle.cc

+++ b/ui/base/resource/resource_bundle.cc

@@ -41,7 +41,6 @@

#endif

#if defined(OS_CHROMEOS)

-#include "ui/base/font_helper_chromeos.h"

#include "ui/gfx/platform_font_linux.h"

#endif

@@ -674,7 +673,6 @@ void ResourceBundle::InitDefaultFontList() {

#if defined(OS_CHROMEOS)

std::string font_family = base::UTF16ToUTF8(

GetLocalizedString(IDS_UI_FONT_FAMILY_CROS));

- ui::ReplaceNotoSansWithRobotoIfEnabled(&font_family);

gfx::FontList::SetDefaultFontDescription(font_family);

// TODO(yukishiino): Remove SetDefaultFontDescription() once the migration to

« no previous file with comments | « ui/base/font_helper_chromeos.cc ('k') | ui/base/ui_base.gyp » ('j') | no next file with comments »