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

Unified Diff: content/plugin/plugin_main_mac.mm

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 | « content/common/plugin_carbon_interpose_constants_mac.cc ('k') | content/public/common/content_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/plugin_main_mac.mm
===================================================================
--- content/plugin/plugin_main_mac.mm (revision 147830)
+++ content/plugin/plugin_main_mac.mm (working copy)
@@ -9,6 +9,7 @@
#include "base/string_util.h"
#include "content/common/plugin_carbon_interpose_constants_mac.h"
#include "content/plugin/plugin_interpose_util_mac.h"
+#include "content/public/common/content_client.h"
#if !defined(__LP64__)
void TrimInterposeEnvironment() {
@@ -17,7 +18,7 @@
std::string interpose_list;
if (!env->GetVar(plugin_interpose_strings::kDYLDInsertLibrariesKey,
&interpose_list)) {
- NOTREACHED() << "No interposing libraries set";
+ LOG(INFO) << "No Carbon Interpose library found.";
return;
}
@@ -26,8 +27,8 @@
// need to handle are:
// 1) The whole string is "<kInterposeLibraryPath>", so just clear it, or
// 2) ":<kInterposeLibraryPath>" is the end of the string, so trim and re-set.
- std::string interpose_library_path(
- plugin_interpose_strings::kInterposeLibraryPath);
+ std::string interpose_library_path =
+ content::GetContentClient()->GetCarbonInterposePath();
DCHECK_GE(interpose_list.size(), interpose_library_path.size());
size_t suffix_offset = interpose_list.size() - interpose_library_path.size();
if (suffix_offset == 0 &&
« no previous file with comments | « content/common/plugin_carbon_interpose_constants_mac.cc ('k') | content/public/common/content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698