diff options
| author | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 10:35:52 +0000 |
|---|---|---|
| committer | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 10:35:52 +0000 |
| commit | 7f18717e883b61612ef851695d173021aeb65cf5 (patch) | |
| tree | 9cc9e090247d7c3663c5c61333234546ec44fbc0 /chrome/browser/plugin_exceptions_table_model.h | |
| parent | b581496c645d056c1deb82420c446f9f8fead915 (diff) | |
| download | chromium_src-7f18717e883b61612ef851695d173021aeb65cf5.zip chromium_src-7f18717e883b61612ef851695d173021aeb65cf5.tar.gz chromium_src-7f18717e883b61612ef851695d173021aeb65cf5.tar.bz2 | |
Merge PluginGroups for Adobe Reader
This patch introduces general support in PluginGroup for multiple version ranges with one minimum secure version each, to be used e.g. for multiple major versions currently supported by their manufacturer.
BUG=65207
TEST=test_shell_tests: PluginGroupTest*
Review URL: http://codereview.chromium.org/5621006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68726 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, 1 insertions, 4 deletions
diff --git a/chrome/browser/plugin_exceptions_table_model.h b/chrome/browser/plugin_exceptions_table_model.h index 6e8f00b..d9f8e40 100644 --- a/chrome/browser/plugin_exceptions_table_model.h +++ b/chrome/browser/plugin_exceptions_table_model.h @@ -15,9 +15,6 @@ #include "chrome/common/notification_observer.h" #include "webkit/glue/plugins/plugin_list.h" -namespace plugin_test_internal { -class PluginExceptionsTableModelTest; -} struct WebPluginInfo; class PluginExceptionsTableModel : public RemoveRowsTableModel, @@ -54,7 +51,7 @@ class PluginExceptionsTableModel : public RemoveRowsTableModel, virtual void GetPlugins(std::vector<PluginGroup>* plugin_groups); private: - friend class plugin_test_internal::PluginExceptionsTableModelTest; + friend class PluginExceptionsTableModelTest; struct SettingsEntry { ContentSettingsPattern pattern; |