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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browser_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 | « chrome/app/chrome_dll_main.cc ('k') | chrome/chrome.xcodeproj/project.pbxproj » ('j') | chrome/common/resource_bundle_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc (revision 10428)
+++ chrome/browser/browser_main.cc (working copy)
@@ -306,7 +306,6 @@
parent_local_state.GetString(prefs::kApplicationLocale));
}
-#if defined(OS_WIN) || defined(OS_LINUX)
// If we're running tests (ui_task is non-null), then the ResourceBundle
// has already been initialized.
if (!parameters.ui_task) {
@@ -315,7 +314,6 @@
// We only load the theme dll in the browser process.
ResourceBundle::GetSharedInstance().LoadThemeResources();
}
-#endif // defined(OS_WIN) || defined(OS_LINUX)
if (!parsed_command_line.HasSwitch(switches::kNoErrorDialogs)) {
// Display a warning if the user is running windows 2000.
« no previous file with comments | « chrome/app/chrome_dll_main.cc ('k') | chrome/chrome.xcodeproj/project.pbxproj » ('j') | chrome/common/resource_bundle_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698