Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: webkit/plugins/npapi/plugin_list.cc

Issue 6469076: Manual merge of QuickTime minimum version update.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/648/src/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/plugins/npapi/plugin_list.h" 5 #include "webkit/plugins/npapi/plugin_list.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 { "flip4mac", "Flip4Mac", "Flip4Mac", kFlip4MacVersionRange, 77 { "flip4mac", "Flip4Mac", "Flip4Mac", kFlip4MacVersionRange,
78 arraysize(kFlip4MacVersionRange), 78 arraysize(kFlip4MacVersionRange),
79 "http://www.telestream.net/flip4mac-wmv/overview.htm" }, 79 "http://www.telestream.net/flip4mac-wmv/overview.htm" },
80 kShockwaveDefinition 80 kShockwaveDefinition
81 }; 81 };
82 82
83 #elif defined(OS_WIN) 83 #elif defined(OS_WIN)
84 // TODO(panayiotis): We should group "RealJukebox NS Plugin" with the rest of 84 // TODO(panayiotis): We should group "RealJukebox NS Plugin" with the rest of
85 // the RealPlayer files. 85 // the RealPlayer files.
86 static const VersionRangeDefinition kQuicktimeVersionRange[] = { 86 static const VersionRangeDefinition kQuicktimeVersionRange[] = {
87 { "", "", "7.6.8" } 87 { "", "", "7.6.9" }
88 }; 88 };
89 static const VersionRangeDefinition kJavaVersionRange[] = { 89 static const VersionRangeDefinition kJavaVersionRange[] = {
90 { "0", "7", "6.0.240" } // "240" is not a typo. 90 { "0", "7", "6.0.240" } // "240" is not a typo.
91 }; 91 };
92 static const VersionRangeDefinition kAdobeReaderVersionRange[] = { 92 static const VersionRangeDefinition kAdobeReaderVersionRange[] = {
93 { "10", "11", "10.0.1" }, 93 { "10", "11", "10.0.1" },
94 { "9", "10", "9.4.2" }, 94 { "9", "10", "9.4.2" },
95 { "0", "9", "8.2.6" } 95 { "0", "9", "8.2.6" }
96 }; 96 };
97 static const VersionRangeDefinition kSilverlightVersionRange[] = { 97 static const VersionRangeDefinition kSilverlightVersionRange[] = {
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 void PluginList::DisableOutdatedPluginGroups() { 830 void PluginList::DisableOutdatedPluginGroups() {
831 disable_outdated_plugins_ = true; 831 disable_outdated_plugins_ = true;
832 } 832 }
833 833
834 PluginList::~PluginList() { 834 PluginList::~PluginList() {
835 } 835 }
836 836
837 837
838 } // namespace npapi 838 } // namespace npapi
839 } // namespace webkit 839 } // namespace webkit
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698