diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 06:27:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 06:27:50 +0000 |
| commit | 191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c (patch) | |
| tree | b982048e66a62646694c16c2cb10cb7ad30d8912 /chrome/browser/chromeos/plugin_selection_policy.cc | |
| parent | cfef856dd2ccece3cea13ccc96ac9579fd2b30b5 (diff) | |
| download | chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.zip chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.tar.gz chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.tar.bz2 | |
Re-land earlier patch that moves the NPAPI implementation from webkit/glue/plugins to webkit/plugins/npapi
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/plugin_selection_policy.cc')
| -rw-r--r-- | chrome/browser/chromeos/plugin_selection_policy.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/plugin_selection_policy.cc b/chrome/browser/chromeos/plugin_selection_policy.cc index 477965a..dd261ea 100644 --- a/chrome/browser/chromeos/plugin_selection_policy.cc +++ b/chrome/browser/chromeos/plugin_selection_policy.cc @@ -120,8 +120,9 @@ bool PluginSelectionPolicy::InitFromFile(const FilePath& policy_file) { int PluginSelectionPolicy::FindFirstAllowed( const GURL& url, - const std::vector<WebPluginInfo>& info) { - for (std::vector<WebPluginInfo>::size_type i = 0; i < info.size(); ++i) { + const std::vector<webkit::npapi::WebPluginInfo>& info) { + for (std::vector<webkit::npapi::WebPluginInfo>::size_type i = 0; + i < info.size(); ++i) { if (IsAllowed(url, info[i].path)) return i; } |