diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
| commit | b6badfa6a538f889025db775662fe61fcb45dc37 (patch) | |
| tree | d12fb54a46443e18a9fa9a671392966ba6751202 /chrome/browser/plugin_exceptions_table_model.h | |
| parent | e0e75f67163f77051d8f62d5275dbf40627d5398 (diff) | |
| download | chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.zip chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.gz chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.bz2 | |
Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69766, which was itself a failed
revert of r69755.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5996003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69768 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; |