summaryrefslogtreecommitdiffstats
path: root/chrome/browser/mock_plugin_exceptions_table_model.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 21:38:12 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 21:38:12 +0000
commitb692a128b073b297a4ce2aa7c468fdd37823e3a8 (patch)
tree3561224ba86e8eabd75f3e7a2f2343002d9a58ff /chrome/browser/mock_plugin_exceptions_table_model.h
parentb07c8d9a926a89d0aa7c0de2e1d2685b728a887e (diff)
downloadchromium_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/mock_plugin_exceptions_table_model.h')
-rw-r--r--chrome/browser/mock_plugin_exceptions_table_model.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/mock_plugin_exceptions_table_model.h b/chrome/browser/mock_plugin_exceptions_table_model.h
index 15a1c5b..c63d67f 100644
--- a/chrome/browser/mock_plugin_exceptions_table_model.h
+++ b/chrome/browser/mock_plugin_exceptions_table_model.h
@@ -17,13 +17,14 @@ class MockPluginExceptionsTableModel : public PluginExceptionsTableModel {
: PluginExceptionsTableModel(map, otr_map) {}
virtual ~MockPluginExceptionsTableModel() {}
- void set_plugins(std::vector<PluginGroup>& plugins);
+ void set_plugins(std::vector<webkit::npapi::PluginGroup>& plugins);
protected:
- virtual void GetPlugins(std::vector<PluginGroup>* plugin_groups);
+ virtual void GetPlugins(
+ std::vector<webkit::npapi::PluginGroup>* plugin_groups);
private:
- std::vector<PluginGroup> plugins_;
+ std::vector<webkit::npapi::PluginGroup> plugins_;
};
#endif // CHROME_BROWSER_MOCK_PLUGIN_EXCEPTIONS_TABLE_MODEL_H_