Fix some obvious not implemented linux bits so we can crash later

in Hammer/chrome.

Now we crash in message loop code.

Review URL: http://codereview.chromium.org/21033


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9162 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 29429d0..3df817b 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -36,7 +36,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/main_function_params.h"
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
 #include "chrome/common/resource_bundle.h"
 #endif
 #include "chrome/common/sandbox_init_wrapper.h"
@@ -166,13 +166,15 @@ void EnableHeapProfiler(const CommandLine& parsed_command_line) {
 }
 
 void CommonSubprocessInit() {
-#if defined(OS_WIN)
+#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): enable when we figure out resource bundle issues
+  // 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
   // the IDC_APPSTARTING cursor from being displayed for a prolonged period
   // while a subprocess is starting.
@@ -315,8 +317,8 @@ int ChromeMain(int argc, const char** argv) {
   }
 
   if (!process_type.empty()) {
-#if defined(OS_WIN)
-    // TODO(port): enable when we figure out resource bundle issues
+#if defined(OS_WIN) || defined(OS_LINUX)
+    // TODO(port-mac): enable when we figure out resource bundle issues
     ResourceBundle::CleanupSharedInstance();
 #endif
   }