diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 17:24:52 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 17:24:52 +0000 |
| commit | a446a53c3d50b49e23bcd93814de95b2ed981aa9 (patch) | |
| tree | 1edf29f36462b0ad0803a54b35b0d355ebf08279 /webkit | |
| parent | fd1f908565b52b160e30edb5b9a979866cadf10f (diff) | |
| download | chromium_src-a446a53c3d50b49e23bcd93814de95b2ed981aa9.zip chromium_src-a446a53c3d50b49e23bcd93814de95b2ed981aa9.tar.gz chromium_src-a446a53c3d50b49e23bcd93814de95b2ed981aa9.tar.bz2 | |
Enabling internal PDF reader should disable Reader, and vice versa.
BUG=50105
Review URL: http://codereview.chromium.org/3674002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62154 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_group.cc | 11 | ||||
| -rw-r--r-- | webkit/glue/plugins/plugin_group.h | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/webkit/glue/plugins/plugin_group.cc b/webkit/glue/plugins/plugin_group.cc index f774957..6e876ad7 100644 --- a/webkit/glue/plugins/plugin_group.cc +++ b/webkit/glue/plugins/plugin_group.cc @@ -13,6 +13,9 @@ #include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/plugins/webplugininfo.h" +const char* PluginGroup::kAdobeReader8GroupName = "Adobe Reader 8"; +const char* PluginGroup::kAdobeReader9GroupName = "Adobe Reader 9"; + #if defined(OS_MACOSX) // Plugin Groups for Mac. // Plugins are listed here as soon as vulnerabilities and solutions @@ -43,10 +46,10 @@ static const PluginGroupDefinition kGroupDefinitions[] = { "http://www.apple.com/quicktime/download/" }, { "java-runtime-environment", "Java 6", "Java", "", "6", "6.0.200", "http://www.java.com/" }, - { "adobe-reader", "Adobe Reader 9", "Adobe Acrobat", "9", "10", "9.4.0", - "http://get.adobe.com/reader/" }, - { "adobe-reader-8", "Adobe Reader 8", "Adobe Acrobat", "0", "9", "8.2.5", - "http://get.adobe.com/reader/" }, + { "adobe-reader", PluginGroup::kAdobeReader9GroupName, "Adobe Acrobat", "9", + "10", "9.4.0", "http://get.adobe.com/reader/" }, + { "adobe-reader-8", PluginGroup::kAdobeReader8GroupName, "Adobe Acrobat", "0", + "9", "8.2.5", "http://get.adobe.com/reader/" }, { "adobe-flash-player", "Flash", "Shockwave Flash", "", "", "10.1.85", "http://get.adobe.com/flashplayer/" }, { "silverlight-3", "Silverlight 3", "Silverlight", "0", "4", "3.0.50106.0", diff --git a/webkit/glue/plugins/plugin_group.h b/webkit/glue/plugins/plugin_group.h index fb193d5..2281437 100644 --- a/webkit/glue/plugins/plugin_group.h +++ b/webkit/glue/plugins/plugin_group.h @@ -46,6 +46,11 @@ struct PluginGroupDefinition { class PluginGroup { public: + // Used by about:plugins to disable Reader plugin when internal PDF viewer is + // enabled. + static const char* kAdobeReader8GroupName; + static const char* kAdobeReader9GroupName; + typedef std::map<std::string, linked_ptr<PluginGroup> > PluginMap; // Creates a PluginGroup from a PluginGroupDefinition. |