apps/app_shim/chrome_main_app_mode_mac.mm - 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: apps/app_shim/chrome_main_app_mode_mac.mm

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

Patch Set: fix 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 | « android_webview/browser/aw_browser_main_parts.cc ('k') | ash/drag_drop/drag_drop_interactive_uitest.cc » ('j') | ui/base/test/run_all_unittests.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: apps/app_shim/chrome_main_app_mode_mac.mm

diff --git a/apps/app_shim/chrome_main_app_mode_mac.mm b/apps/app_shim/chrome_main_app_mode_mac.mm

index 18b8f9e1cfdbca32b371e69ba850be1f2bc33587..8b91322a957c3b71f02ffe6b222b8054c851f420 100644

--- a/apps/app_shim/chrome_main_app_mode_mac.mm

+++ b/apps/app_shim/chrome_main_app_mode_mac.mm

@@ -582,7 +582,8 @@ int ChromeAppModeStart(const app_mode::ChromeAppModeInfo* info) {

l10n_util::GetApplicationLocale(preferred_localization));

// Load localized strings.

- ResourceBundle::InitSharedInstanceLocaleOnly(locale, NULL);

+ ui::ResourceBundle::InitSharedInstanceWithLocale(

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

// Launch the IO thread.

base::Thread::Options io_thread_options;

« no previous file with comments | « android_webview/browser/aw_browser_main_parts.cc ('k') | ash/drag_drop/drag_drop_interactive_uitest.cc » ('j') | ui/base/test/run_all_unittests.cc » ('J')