Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2723)

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: 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
« no previous file with comments | « no previous file | apps/app_shim/chrome_main_app_mode_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f0785f9c81460bfaebc66bfd0fdd7a3997f44c06..c5b66fee018c30b27e0eb995a6eb32adfa8555e7 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -56,8 +56,10 @@ 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,
+ ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698