| Index: content/browser/plugin_process_host.cc
|
| ===================================================================
|
| --- content/browser/plugin_process_host.cc (revision 147830)
|
| +++ content/browser/plugin_process_host.cc (working copy)
|
| @@ -261,14 +261,17 @@
|
| #if defined(OS_POSIX)
|
| base::EnvironmentVector env;
|
| #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);
|
| - const char* existing_list =
|
| - getenv(plugin_interpose_strings::kDYLDInsertLibrariesKey);
|
| - if (existing_list) {
|
| - interpose_list.insert(0, ":");
|
| - interpose_list.insert(0, existing_list);
|
| + std::string interpose_list =
|
| + content::GetContentClient()->GetCarbonInterposePath();
|
| + if (!interpose_list.empty()) {
|
| + // Add our interposing library for Carbon. This is stripped back out in
|
| + // plugin_main.cc, so changes here should be reflected there.
|
| + const char* existing_list =
|
| + getenv(plugin_interpose_strings::kDYLDInsertLibrariesKey);
|
| + if (existing_list) {
|
| + interpose_list.insert(0, ":");
|
| + interpose_list.insert(0, existing_list);
|
| + }
|
| }
|
| env.push_back(std::pair<std::string, std::string>(
|
| plugin_interpose_strings::kDYLDInsertLibrariesKey,
|
|
|