| Index: webkit/plugins/npapi/plugin_lib.cc
|
| diff --git a/webkit/plugins/npapi/plugin_lib.cc b/webkit/plugins/npapi/plugin_lib.cc
|
| index f0793c5be7dbca503f8cb82e77357d79f2f59c3d..8b99036984c9d67c5f87f9a1635d7da11ec9e9e9 100644
|
| --- a/webkit/plugins/npapi/plugin_lib.cc
|
| +++ b/webkit/plugins/npapi/plugin_lib.cc
|
| @@ -180,6 +180,7 @@ bool PluginLib::Load() {
|
|
|
| bool rv = false;
|
| base::NativeLibrary library = 0;
|
| + std::string error;
|
|
|
| if (!internal_) {
|
| #if defined(OS_WIN)
|
| @@ -193,14 +194,16 @@ bool PluginLib::Load() {
|
| std::wstring::npos) {
|
| library = base::LoadNativeLibraryDynamically(web_plugin_info_.path);
|
| } else {
|
| - library = base::LoadNativeLibrary(web_plugin_info_.path);
|
| + library = base::LoadNativeLibrary(web_plugin_info_.path, &error);
|
| }
|
| -#else // OS_WIN
|
| - library = base::LoadNativeLibrary(web_plugin_info_.path);
|
| -#endif // OS_WIN
|
| - if (library == 0) {
|
| +#else
|
| + library = base::LoadNativeLibrary(web_plugin_info_.path, &error);
|
| +#endif
|
| +
|
| + if (!library) {
|
| LOG_IF(ERROR, PluginList::DebugPluginLoading())
|
| - << "Couldn't load plugin " << web_plugin_info_.path.value();
|
| + << "Couldn't load plugin " << web_plugin_info_.path.value() << " "
|
| + << error;
|
| return rv;
|
| }
|
|
|
|
|