chrome/app/chrome_main_delegate.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/app/chrome_main_delegate.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/app/chrome_main_delegate.cc

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc

index 0faeaf5e9310c1d5eec438f036b4c45cf7c23dee..050b184e21f0c9aae3f3c8e8711b6ed4fed387e8 100644

--- a/chrome/app/chrome_main_delegate.cc

+++ b/chrome/app/chrome_main_delegate.cc

@@ -738,7 +738,8 @@ void ChromeMainDelegate::PreSandboxStartup() {

const std::string loaded_locale = locale;

#else

const std::string loaded_locale =

- ResourceBundle::InitSharedInstanceWithLocale(locale, NULL);

+ ui::ResourceBundle::InitSharedInstanceWithLocale(

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

base::FilePath resources_pack_path;

PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);

« no previous file with comments | « ash/wm/ash_native_cursor_manager_interactive_uitest.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »