android_webview/browser/aw_browser_main_parts.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: android_webview/browser/aw_browser_main_parts.cc

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

Patch Set: 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: android_webview/browser/aw_browser_main_parts.cc

diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc

index 459e1b5d875562e6bcd315b8358c184452c6709c..e94a7b936f546b74127c6055564e04b4c7452178 100644

--- a/android_webview/browser/aw_browser_main_parts.cc

+++ b/android_webview/browser/aw_browser_main_parts.cc

@@ -56,8 +56,8 @@ int AwBrowserMainParts::PreCreateThreads() {

// fail) just to create the ResourceBundle instance. We should refactor

// ResourceBundle/GetApplicationLocale to not require an instance to be

// initialized.

- ui::ResourceBundle::InitSharedInstanceLocaleOnly(

- l10n_util::GetDefaultLocale(), NULL);

+ ui::ResourceBundle::InitSharedInstanceWithLocale(

+ l10n_util::GetDefaultLocale(), NULL, false);

std::string locale = l10n_util::GetApplicationLocale(std::string()) + ".pak";

if (AwAssets::OpenAsset(locale, &pak_fd, &pak_off, &pak_len)) {

VLOG(0) << "Load from apk succesful, fd=" << pak_fd << " off=" << pak_off

« no previous file with comments | « no previous file | apps/app_shim/chrome_main_app_mode_mac.mm » ('j') | ui/base/resource/resource_bundle.h » ('J')