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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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 | « ash/wm/ash_native_cursor_manager_interactive_uitest.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | ui/base/test/run_all_unittests.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 6a0e22d2306bf12737e7ce8c6a1c170f52df7a34..01b9d94520a00934f960cabda6194a91de8f8fce 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -740,7 +740,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') | ui/base/test/run_all_unittests.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698