diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
| commit | c85b0ba71b5a55647b01de9d345e46896979033d (patch) | |
| tree | ae99657ca1440b7540da473e1bbe6156e43e9be3 /chrome/browser/plugin_exceptions_table_model.cc | |
| parent | 887ba3adc7b32b7df315ef292ae9395fd75653e5 (diff) | |
| download | chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.zip chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.gz chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.bz2 | |
Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69755, which broke the tree.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5998002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69771 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 5b2a2c1..7ad5b13 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<webkit::npapi::PluginGroup>* plugin_groups) { - webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, plugin_groups); + std::vector<PluginGroup>* plugin_groups) { + NPAPI::PluginList::Singleton()->GetPluginGroups(false, plugin_groups); } void PluginExceptionsTableModel::LoadSettings() { int group_id = 0; - std::vector<webkit::npapi::PluginGroup> plugins; + std::vector<PluginGroup> plugins; GetPlugins(&plugins); for (size_t i = 0; i < plugins.size(); ++i) { std::string plugin = plugins[i].identifier(); |