diff options
| author | amanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 21:33:09 +0000 |
|---|---|---|
| committer | amanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 21:33:09 +0000 |
| commit | f6b1d3e64758a188d579cb4d0bb8fa011687ea21 (patch) | |
| tree | abdea2aac057598d52be177b11b11fe039e3436b /webkit | |
| parent | d3c902b2f2d157a0e40cfe4f684c3e95fc27fc80 (diff) | |
| download | chromium_src-f6b1d3e64758a188d579cb4d0bb8fa011687ea21.zip chromium_src-f6b1d3e64758a188d579cb4d0bb8fa011687ea21.tar.gz chromium_src-f6b1d3e64758a188d579cb4d0bb8fa011687ea21.tar.bz2 | |
Add a temporary flag to enable plugins on the Mac and Linux while
leaving the default to "disabled" until they work better.
Temporary, for use by people who like living on the bleeding edge.
BUG=none
TEST=none
jam: review
evan,jon: FYI
Review URL: http://codereview.chromium.org/149570
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_mac.mm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm index 28cf21d..90391ec 100644 --- a/webkit/glue/plugins/plugin_list_mac.mm +++ b/webkit/glue/plugins/plugin_list_mac.mm @@ -68,15 +68,12 @@ void PluginList::LoadPluginsFromDir(const FilePath &path) { } bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info) { - // TODO(port): uncomment the next line to enable plugins--disabled by - // default so that public dev builds fall back correctly to the no-plugin - // code on pages with plugins. - return false; - // Hierarchy check // (we're loading plugins hierarchically from Library folders, so plugins we // encounter earlier must override plugins we encounter later) + // first, test to make sure the user really wants plugins + for (size_t i = 0; i < plugins_.size(); ++i) { if (plugins_[i].path.BaseName() == info.path.BaseName()) { return false; // We already have a loaded plugin higher in the hierarchy. |