diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 21:38:12 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 21:38:12 +0000 |
| commit | b692a128b073b297a4ce2aa7c468fdd37823e3a8 (patch) | |
| tree | 3561224ba86e8eabd75f3e7a2f2343002d9a58ff /chrome/browser/plugin_exceptions_table_model.cc | |
| parent | b07c8d9a926a89d0aa7c0de2e1d2685b728a887e (diff) | |
| download | chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.zip chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.tar.gz chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.tar.bz2 | |
Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put
them in the webkit::npapi namespace.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6012002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_exceptions_table_model.cc')
| -rw-r--r-- | chrome/browser/plugin_exceptions_table_model.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/plugin_exceptions_table_model.cc b/chrome/browser/plugin_exceptions_table_model.cc index 7ad5b13..5b2a2c1 100644 --- a/chrome/browser/plugin_exceptions_table_model.cc +++ b/chrome/browser/plugin_exceptions_table_model.cc @@ -134,13 +134,13 @@ void PluginExceptionsTableModel::ClearSettings() { } void PluginExceptionsTableModel::GetPlugins( - std::vector<PluginGroup>* plugin_groups) { - NPAPI::PluginList::Singleton()->GetPluginGroups(false, plugin_groups); + std::vector<webkit::npapi::PluginGroup>* plugin_groups) { + webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, plugin_groups); } void PluginExceptionsTableModel::LoadSettings() { int group_id = 0; - std::vector<PluginGroup> plugins; + std::vector<webkit::npapi::PluginGroup> plugins; GetPlugins(&plugins); for (size_t i = 0; i < plugins.size(); ++i) { std::string plugin = plugins[i].identifier(); |