chrome/browser/ui/startup/bad_flags_prompt.cc - Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

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: chrome/browser/ui/startup/bad_flags_prompt.cc

Issue 457103003: Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE Created 6 years, 4 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: chrome/browser/ui/startup/bad_flags_prompt.cc

diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc

index e3161d71d1d4f8a9dfe37f3499f2b7ed56081f3f..f924efdcf0c8f1b7d34e94d7d50f12405bc4050d 100644

--- a/chrome/browser/ui/startup/bad_flags_prompt.cc

+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc

@@ -106,7 +106,8 @@ void MaybeShowInvalidUserDataDirWarningDialog() {

const char kUserDataDirDialogFallbackLocale[] = "en-US";

if (locale.empty())

locale = kUserDataDirDialogFallbackLocale;

- ResourceBundle::InitSharedInstanceWithLocale(locale, NULL);

+ ui::ResourceBundle::InitSharedInstanceWithLocale(

+ locale, NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);

}

const base::string16& title =

« no previous file with comments | « chrome/browser/chrome_browser_main_mac.mm ('k') | chrome/service/service_process.cc » ('j') | no next file with comments »