diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 00:44:53 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 00:44:53 +0000 |
| commit | 01a899a84aa8b6f307b63679cb7de3191517d54a (patch) | |
| tree | a655886a8a24bc9bf2d57fc6b21fcf25ac6d1e6e /webkit | |
| parent | 5be6d4fb77e398acc061239c66d89467235d6459 (diff) | |
| download | chromium_src-01a899a84aa8b6f307b63679cb7de3191517d54a.zip chromium_src-01a899a84aa8b6f307b63679cb7de3191517d54a.tar.gz chromium_src-01a899a84aa8b6f307b63679cb7de3191517d54a.tar.bz2 | |
Merge 120832 - Infobar the NVIDIA 3D vision plug-ins.
BUG=113047
TBR=bauerb
Review URL: https://chromiumcodereview.appspot.com/9348024
TBR=cevans@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9375036
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@121358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/npapi/plugin_list.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc index c526efb..7595a7b 100644 --- a/webkit/plugins/npapi/plugin_list.cc +++ b/webkit/plugins/npapi/plugin_list.cc @@ -144,6 +144,9 @@ static const VersionRangeDefinition kRealPlayerVersionRange[] = { static const VersionRangeDefinition kWindowsMediaPlayerVersionRange[] = { { "", "", "", true } }; +static const VersionRangeDefinition kNvidia3DVersionRange[] = { + { "", "", "", true } +}; static const PluginGroupDefinition kGroupDefinitions[] = { kFlashDefinition, { "apple-quicktime", PluginGroup::kQuickTimeGroupName, "QuickTime Plug-in", @@ -170,6 +173,8 @@ static const PluginGroupDefinition kGroupDefinitions[] = { arraysize(kWindowsMediaPlayerVersionRange), "" }, { "microsoft-office", "Microsoft Office", "Microsoft Office", NULL, 0, "" }, + { "nvidia-3d", "NVIDIA 3D", "NVIDIA 3D", kNvidia3DVersionRange, + arraysize(kNvidia3DVersionRange), "" }, }; #elif defined(OS_CHROMEOS) |