diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 22:06:22 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 22:06:22 +0000 |
| commit | 84479325c4ccdecd2bddc2f257d436b66595aa10 (patch) | |
| tree | cd91804f50e952a09f84c6bdf7f68bdb3dab4bc4 /content/common | |
| parent | e51eeb7307ea00ec6ef593d938a60f356e3a0882 (diff) | |
| download | chromium_src-84479325c4ccdecd2bddc2f257d436b66595aa10.zip chromium_src-84479325c4ccdecd2bddc2f257d436b66595aa10.tar.gz chromium_src-84479325c4ccdecd2bddc2f257d436b66595aa10.tar.bz2 | |
linux: don't always print dlopen errors from LoadNativeLibrary
Instead, return them to the caller and let the caller decide whether
the error is worth notifying the user about.
BUG=79068
Review URL: http://codereview.chromium.org/6864020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/pepper_plugin_registry.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc index 2da9a0f..b91e701 100644 --- a/content/common/pepper_plugin_registry.cc +++ b/content/common/pepper_plugin_registry.cc @@ -129,9 +129,12 @@ void PepperPluginRegistry::PreloadModules() { ComputeList(&plugins); for (size_t i = 0; i < plugins.size(); ++i) { if (!plugins[i].is_internal) { - base::NativeLibrary library = base::LoadNativeLibrary(plugins[i].path); + std::string error; + base::NativeLibrary library = base::LoadNativeLibrary(plugins[i].path, + &error); LOG_IF(WARNING, !library) << "Unable to load plugin " - << plugins[i].path.value(); + << plugins[i].path.value() << " " + << error; } } } |