summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins/plugin_list.cc
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-26 02:06:33 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-26 02:06:33 +0000
commit5a50cf4aa4340d6674ffd6e7ef4f2dfc9b06ee8f (patch)
tree9bc78ab3aea37c059359f1a21b647012c5eb1293 /webkit/glue/plugins/plugin_list.cc
parent4a2e88b5a5a3025f54cde74d508cbacfcea7bf30 (diff)
downloadchromium_src-5a50cf4aa4340d6674ffd6e7ef4f2dfc9b06ee8f.zip
chromium_src-5a50cf4aa4340d6674ffd6e7ef4f2dfc9b06ee8f.tar.gz
chromium_src-5a50cf4aa4340d6674ffd6e7ef4f2dfc9b06ee8f.tar.bz2
chromeos: Only look for plugins in Chrome's /opt directory.
Per discussion with Zelidrag, Chrome OS puts all of its plugins in /opt/google/chrome/plugins, so we can skip looking anywhere outside of there. Embarrassingly, I also missed the Plugins subdirectory of the user data dir in my previous change. BUG=chromium-os:4194 TEST=tried it on a Chrome OS machine Review URL: http://codereview.chromium.org/3159040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/plugin_list.cc')
-rw-r--r--webkit/glue/plugins/plugin_list.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index be0ec58..eeccdee 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -45,8 +45,11 @@ void PluginList::RefreshPlugins() {
}
void PluginList::AddExtraPluginPath(const FilePath& plugin_path) {
+ // Chrome OS only loads plugins from /opt/google/chrome/plugins.
+#if !defined(OS_CHROMEOS)
AutoLock lock(lock_);
extra_plugin_paths_.push_back(plugin_path);
+#endif
}
void PluginList::RemoveExtraPluginPath(const FilePath& plugin_path) {
@@ -59,8 +62,11 @@ void PluginList::RemoveExtraPluginPath(const FilePath& plugin_path) {
}
void PluginList::AddExtraPluginDir(const FilePath& plugin_dir) {
+ // Chrome OS only loads plugins from /opt/google/chrome/plugins.
+#if !defined(OS_CHROMEOS)
AutoLock lock(lock_);
extra_plugin_dirs_.push_back(plugin_dir);
+#endif
}
void PluginList::RegisterInternalPlugin(const PluginVersionInfo& info) {