From b6badfa6a538f889025db775662fe61fcb45dc37 Mon Sep 17 00:00:00 2001 From: "chase@chromium.org" Date: Mon, 20 Dec 2010 23:42:40 +0000 Subject: 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 --- chrome/browser/plugin_exceptions_table_model.h | 5 +++-- 1 file changed, 3 insertions(+), 2 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 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* plugin_groups); + virtual void GetPlugins( + std::vector* plugin_groups); private: friend class PluginExceptionsTableModelTest; -- cgit v1.1