summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_service.cc
diff options
context:
space:
mode:
authormpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-21 01:44:30 +0000
committermpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-21 01:44:30 +0000
commit367230c507ce20ff3b42013d0a3eac4ee01efb88 (patch)
treeb217eb19f3c5f662debd5fb562b028d427c3ae19 /chrome/browser/plugin_service.cc
parent52fadc8176f4076cc021c15d9ccc022e17fd8e97 (diff)
downloadchromium_src-367230c507ce20ff3b42013d0a3eac4ee01efb88.zip
chromium_src-367230c507ce20ff3b42013d0a3eac4ee01efb88.tar.gz
chromium_src-367230c507ce20ff3b42013d0a3eac4ee01efb88.tar.bz2
Add NPAPI plugins contained in extensions to the PluginList.
Review URL: http://codereview.chromium.org/20521 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_service.cc')
-rw-r--r--chrome/browser/plugin_service.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
index 7889f79..ea25346 100644
--- a/chrome/browser/plugin_service.cc
+++ b/chrome/browser/plugin_service.cc
@@ -69,6 +69,12 @@ const FilePath& PluginService::GetChromePluginDataDir() {
return chrome_plugin_data_dir_;
}
+void PluginService::AddExtraPluginDir(const FilePath& plugin_dir) {
+ AutoLock lock(lock_);
+ NPAPI::PluginList::ResetPluginsLoaded();
+ NPAPI::PluginList::AddExtraPluginDir(plugin_dir);
+}
+
const std::wstring& PluginService::GetUILocale() {
return ui_locale_;
}