diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/plugin_process_host.cc | 2 | ||||
| -rw-r--r-- | chrome/plugin/plugin_main.cc | 2 | ||||
| -rw-r--r-- | chrome/plugin/plugin_main_mac.mm | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 5e1afe9..203e843 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -424,7 +424,7 @@ bool PluginProcessHost::Init(const WebPluginInfo& info, #if defined(OS_POSIX) base::environment_vector env; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(__LP64__) // Add our interposing library for Carbon. This is stripped back out in // plugin_main.cc, so changes here should be reflected there. std::string interpose_list(plugin_interpose_strings::kInterposeLibraryPath); diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc index 1e77325..06c05b1 100644 --- a/chrome/plugin/plugin_main.cc +++ b/chrome/plugin/plugin_main.cc @@ -53,7 +53,9 @@ int PluginMain(const MainFunctionParams& parameters) { // The main thread of the plugin services UI. #if defined(OS_MACOSX) +#if !defined(__LP64__) TrimInterposeEnvironment(); +#endif InitializeChromeApplication(); #endif MessageLoop main_message_loop(MessageLoop::TYPE_UI); diff --git a/chrome/plugin/plugin_main_mac.mm b/chrome/plugin/plugin_main_mac.mm index 1f729a4..56b7c95 100644 --- a/chrome/plugin/plugin_main_mac.mm +++ b/chrome/plugin/plugin_main_mac.mm @@ -7,6 +7,7 @@ #include "chrome/common/plugin_carbon_interpose_constants_mac.h" #include "chrome/plugin/plugin_interpose_util_mac.h" +#if !defined(__LP64__) void TrimInterposeEnvironment() { const char* interpose_list = getenv(plugin_interpose_strings::kDYLDInsertLibrariesKey); @@ -37,6 +38,7 @@ void TrimInterposeEnvironment() { NOTREACHED() << "Missing Carbon interposing library"; } } +#endif void InitializeChromeApplication() { [CrApplication sharedApplication]; |