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

Unified Diff: content/browser/plugin_process_host.cc

Issue 10806075: Get the path of the plugin interposing library from the embedder, since they're the ones who bundle… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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/common/chrome_content_client.cc ('k') | content/common/plugin_carbon_interpose_constants_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | content/common/plugin_carbon_interpose_constants_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698