From c85b0ba71b5a55647b01de9d345e46896979033d Mon Sep 17 00:00:00 2001 From: "chase@chromium.org" Date: Tue, 21 Dec 2010 00:23:26 +0000 Subject: 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 --- chrome/browser/plugin_exceptions_table_model.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'chrome/browser/plugin_exceptions_table_model.h') diff --git a/chrome/browser/plugin_exceptions_table_model.h b/chrome/browser/plugin_exceptions_table_model.h index 045c218..d345b95 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/plugins/npapi/plugin_list.h" +#include "webkit/glue/plugins/plugin_list.h" struct WebPluginInfo; @@ -48,8 +48,7 @@ class PluginExceptionsTableModel : public RemoveRowsTableModel, protected: // Subclasses can override this method for testing. - virtual void GetPlugins( - std::vector* plugin_groups); + virtual void GetPlugins(std::vector* plugin_groups); private: friend class PluginExceptionsTableModelTest; -- cgit v1.1