diff options
| author | ibraaaa@google.com <ibraaaa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 22:09:22 +0000 |
|---|---|---|
| committer | ibraaaa@google.com <ibraaaa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 22:09:22 +0000 |
| commit | 373f2db0d08410c67760fa404a953ae3eee34aed (patch) | |
| tree | 0410ad15b2637def76c1e019433ed84ea9f266a2 | |
| parent | 652463012f48f9b4453d351eba2e5fee7a3589a2 (diff) | |
| download | chromium_src-373f2db0d08410c67760fa404a953ae3eee34aed.zip chromium_src-373f2db0d08410c67760fa404a953ae3eee34aed.tar.gz chromium_src-373f2db0d08410c67760fa404a953ae3eee34aed.tar.bz2 | |
Updated Hardcoded definitions in PluginList and PluginGroup to match .json files
BUG=124396
Review URL: https://chromiumcodereview.appspot.com/10878053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153310 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/plugins/npapi/plugin_group.cc | 8 | ||||
| -rw-r--r-- | webkit/plugins/npapi/plugin_list.cc | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/webkit/plugins/npapi/plugin_group.cc b/webkit/plugins/npapi/plugin_group.cc index 9146726..2f62a29 100644 --- a/webkit/plugins/npapi/plugin_group.cc +++ b/webkit/plugins/npapi/plugin_group.cc @@ -20,10 +20,10 @@ namespace webkit { namespace npapi { // static -const char PluginGroup::kAdobeReaderGroupName[] = "Adobe Acrobat"; -const char PluginGroup::kJavaGroupName[] = "Java"; -const char PluginGroup::kQuickTimeGroupName[] = "QuickTime"; -const char PluginGroup::kShockwaveGroupName[] = "Shockwave"; +const char PluginGroup::kAdobeReaderGroupName[] = "Adobe Reader"; +const char PluginGroup::kJavaGroupName[] = "Java(TM)"; +const char PluginGroup::kQuickTimeGroupName[] = "QuickTime Player"; +const char PluginGroup::kShockwaveGroupName[] = "Adobe Shockwave Player"; const char PluginGroup::kRealPlayerGroupName[] = "RealPlayer"; const char PluginGroup::kSilverlightGroupName[] = "Silverlight"; const char PluginGroup::kWindowsMediaPlayerGroupName[] = "Windows Media Player"; diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc index 1ead724..d6a7688 100644 --- a/webkit/plugins/npapi/plugin_list.cc +++ b/webkit/plugins/npapi/plugin_list.cc @@ -61,7 +61,7 @@ namespace npapi { // Try and share the group definition for plug-ins that are // very consistent across OS'es. #define kFlashDefinition { \ - "adobe-flash-player", "Flash", "Shockwave Flash" } + "adobe-flash-player", "Adobe Flash Player", "Shockwave Flash" } #define kShockwaveDefinition { \ "adobe-shockwave", PluginGroup::kShockwaveGroupName, \ @@ -85,7 +85,8 @@ static const PluginGroupDefinition kGroupDefinitions[] = { { "java-runtime-environment", PluginGroup::kJavaGroupName, "Java" }, kSilverlightDefinition, { "flip4mac", "Flip4Mac", "Flip4Mac" }, - { "divx-player", "DivX Plus Web Player", "DivX Plus Web Player" }, + { "divx-player", "DivX Web Player", "DivX Plus Web Player" }, + { "realplayer", PluginGroup::kRealPlayerGroupName, "RealPlayer" }, kShockwaveDefinition, kChromePdfDefinition, kGoogleTalkDefinition, @@ -102,7 +103,7 @@ static const PluginGroupDefinition kGroupDefinitions[] = { { "adobe-reader", PluginGroup::kAdobeReaderGroupName, "Adobe Acrobat" }, kSilverlightDefinition, kShockwaveDefinition, - { "divx-player", "DivX Player", "DivX Web Player" }, + { "divx-player", "DivX Web Player", "DivX Web Player" }, { "realplayer", PluginGroup::kRealPlayerGroupName, "RealPlayer" }, { "windows-media-player", PluginGroup::kWindowsMediaPlayerGroupName, "Windows Media Player" }, |