summaryrefslogtreecommitdiffstats
path: root/content/plugin/plugin_thread.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-18 22:06:22 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-18 22:06:22 +0000
commit84479325c4ccdecd2bddc2f257d436b66595aa10 (patch)
treecd91804f50e952a09f84c6bdf7f68bdb3dab4bc4 /content/plugin/plugin_thread.cc
parente51eeb7307ea00ec6ef593d938a60f356e3a0882 (diff)
downloadchromium_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/plugin/plugin_thread.cc')
-rw-r--r--content/plugin/plugin_thread.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index 1d14c22..e0ce6d1 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -74,7 +74,7 @@ PluginThread::PluginThread()
PatchNPNFunctions();
// Preload the library to avoid loading, unloading then reloading
- preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_);
+ preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_, NULL);
scoped_refptr<webkit::npapi::PluginLib> plugin(
webkit::npapi::PluginLib::CreatePluginLib(plugin_path_));