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/plugin_exceptions_table_model.h | |
| 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/plugin_exceptions_table_model.h')
| -rw-r--r-- | chrome/browser/plugin_exceptions_table_model.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/plugin_exceptions_table_model.h b/chrome/browser/plugin_exceptions_table_model.h index d345b95..045c218 100644 --- a/chrome/browser/plugin_exceptions_table_model.h +++ b/chrome/browser/plugin_exceptions_table_model.h @@ -13,7 +13,7 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/remove_rows_table_model.h" #include "chrome/common/notification_observer.h" -#include "webkit/glue/plugins/plugin_list.h" +#include "webkit/plugins/npapi/plugin_list.h" struct WebPluginInfo; @@ -48,7 +48,8 @@ class PluginExceptionsTableModel : public RemoveRowsTableModel, protected: // Subclasses can override this method for testing. - virtual void GetPlugins(std::vector<PluginGroup>* plugin_groups); + virtual void GetPlugins( + std::vector<webkit::npapi::PluginGroup>* plugin_groups); private: friend class PluginExceptionsTableModelTest; |