diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 16:52:42 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 16:52:42 +0000 |
| commit | 18c0b57df5cf6a7cf06edc35261af82b9f6c6e8e (patch) | |
| tree | fd8ddcfcfac16022510590ba9e32a75a1ac3dee2 /webkit | |
| parent | 964b67701e07ea50ca09747237bfeef23f1b2520 (diff) | |
| download | chromium_src-18c0b57df5cf6a7cf06edc35261af82b9f6c6e8e.zip chromium_src-18c0b57df5cf6a7cf06edc35261af82b9f6c6e8e.tar.gz chromium_src-18c0b57df5cf6a7cf06edc35261af82b9f6c6e8e.tar.bz2 | |
chromeos: Skip ~/.mozilla/plugins.
The user's home directory will be mounted read-write. If a
plugin gets copied there somehow, this should make sure
that we don't load it.
BUG=chromium-os:4194
TEST=tried it
Review URL: http://codereview.chromium.org/3162039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_posix.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_list_posix.cc b/webkit/glue/plugins/plugin_list_posix.cc index 92eef7e..4e28d1a 100644 --- a/webkit/glue/plugins/plugin_list_posix.cc +++ b/webkit/glue/plugins/plugin_list_posix.cc @@ -135,12 +135,14 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) { plugin_dirs->push_back(FilePath(paths[i])); } +#if !defined(OS_CHROMEOS) // 2) NS_USER_PLUGINS_DIR: ~/.mozilla/plugins. // This is a de-facto standard, so even though we're not Mozilla, let's // look in there too. FilePath home = file_util::GetHomeDir(); if (!home.empty()) plugin_dirs->push_back(home.Append(".mozilla/plugins")); +#endif // 3) NS_SYSTEM_PLUGINS_DIR: // This varies across different browsers and versions, so check 'em all. |