remoting/base/resources_linux.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: remoting/base/resources_linux.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: remoting/base/resources_linux.cc

diff --git a/remoting/base/resources_linux.cc b/remoting/base/resources_linux.cc

index d7d23ba3886b7364cb9b3656a667eeefc183d2b3..63a53f2b496438cab9e58165685a48afc9fbbc6a 100644

--- a/remoting/base/resources_linux.cc

+++ b/remoting/base/resources_linux.cc

@@ -31,7 +31,8 @@ bool LoadResources(const std::string& pref_locale) {

PathService::Override(ui::DIR_LOCALES,

path.AppendASCII(kLocaleResourcesDirName));

- ui::ResourceBundle::InitSharedInstanceLocaleOnly(pref_locale, NULL);

+ ui::ResourceBundle::InitSharedInstanceWithLocale(

+ pref_locale, NULL, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);

}

return true;

« no previous file with comments | « content/public/test/render_view_test.cc ('k') | remoting/base/resources_mac.cc » ('j') | no next file with comments »