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

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 28171: Wire up resource bundles on the mac:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 | chrome/browser/browser_main.cc » ('j') | chrome/common/resource_bundle_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_dll_main.cc
===================================================================
--- chrome/app/chrome_dll_main.cc (revision 10428)
+++ chrome/app/chrome_dll_main.cc (working copy)
@@ -169,13 +169,10 @@
}
void CommonSubprocessInit() {
-#if defined(OS_WIN) || defined(OS_LINUX)
// Initialize ResourceBundle which handles files loaded from external
// sources. The language should have been passed in to us from the
// browser process as a command line flag.
- // TODO(port-mac): enable when we figure out resource bundle issues
ResourceBundle::InitSharedInstance(std::wstring());
-#endif
#if defined(OS_WIN)
// HACK: Let Windows know that we have started. This is needed to suppress
@@ -330,10 +327,7 @@
}
if (!process_type.empty()) {
-#if defined(OS_WIN) || defined(OS_LINUX)
- // TODO(port-mac): enable when we figure out resource bundle issues
ResourceBundle::CleanupSharedInstance();
-#endif
}
#if defined(OS_WIN)
« no previous file with comments | « no previous file | chrome/browser/browser_main.cc » ('j') | chrome/common/resource_bundle_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698