- Mac: Add plugin_carbon_interpose target to fix plugin crash (issue #680).

- Mac: Add version number to dylib files (issue #730).


git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@795 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef/common/content_client.cc

@@ -18,6 +18,14 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/user_agent.h"
 
+namespace {
+
+const char kInterposeLibraryPath[] =
+    "@executable_path/../../../libplugin_carbon_interpose.dylib";
+
+}  // namespace
+
+
 CefContentClient::CefContentClient(CefRefPtr<CefApp> application)
     : application_(application),
       pack_loading_disabled_(false),
@@ -100,6 +108,12 @@ gfx::Image& CefContentClient::GetNativeImageNamed(int resource_id) const {
   return value;
 }
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+std::string CefContentClient::GetCarbonInterposePath() const {
+  return std::string(kInterposeLibraryPath);
+}
+#endif
+
 FilePath CefContentClient::GetPathForResourcePack(
     const FilePath& pack_path,
     ui::ScaleFactor scale_factor) {

libcef/common/content_client.h

@@ -35,6 +35,10 @@ class CefContentClient : public content::ContentClient,
       ui::ScaleFactor scale_factor) const OVERRIDE;
   virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE;
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  virtual std::string GetCarbonInterposePath() const OVERRIDE;
+#endif
+
   CefRefPtr<CefApp> application() const { return application_; }
 
   void set_pack_loading_disabled(bool val) { pack_loading_disabled_ = val; }