OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/plugins/npapi/plugin_list.h" | 5 #include "webkit/plugins/npapi/plugin_list.h" |
6 | 6 |
7 #import <Foundation/Foundation.h> | 7 #import <Foundation/Foundation.h> |
8 | 8 |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 const FilePath& path, std::vector<FilePath>* plugins) { | 80 const FilePath& path, std::vector<FilePath>* plugins) { |
81 file_util::FileEnumerator enumerator(path, | 81 file_util::FileEnumerator enumerator(path, |
82 false, // not recursive | 82 false, // not recursive |
83 file_util::FileEnumerator::DIRECTORIES); | 83 file_util::FileEnumerator::DIRECTORIES); |
84 for (FilePath path = enumerator.Next(); !path.value().empty(); | 84 for (FilePath path = enumerator.Next(); !path.value().empty(); |
85 path = enumerator.Next()) { | 85 path = enumerator.Next()) { |
86 plugins->push_back(path); | 86 plugins->push_back(path); |
87 } | 87 } |
88 } | 88 } |
89 | 89 |
| 90 // TODO(ibraaaa): DELETE. http://crbug.com/124396 |
90 bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info, | 91 bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info, |
91 ScopedVector<PluginGroup>* plugin_groups) { | 92 ScopedVector<PluginGroup>* plugin_groups) { |
92 return !IsBlacklistedPlugin(info); | 93 return !IsBlacklistedPlugin(info); |
93 } | 94 } |
94 | 95 |
| 96 bool PluginList::ShouldLoadPluginUsingPluginList( |
| 97 const WebPluginInfo& info, |
| 98 std::vector<webkit::WebPluginInfo>* plugins) { |
| 99 return !IsBlacklistedPlugin(info); |
| 100 } |
| 101 |
95 } // namespace npapi | 102 } // namespace npapi |
96 } // namespace webkit | 103 } // namespace webkit |
OLD | NEW |