summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-04 20:47:04 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-04 20:47:04 +0000
commit8707ec8224366e91d75dfbcbb03cf11161fcc6bc (patch)
tree10f5626b342843456a8ce6af43b312df2e1d610f /webkit
parentdf88e1bb36cdd928a83e81d0b090e7c76ada2320 (diff)
downloadchromium_src-8707ec8224366e91d75dfbcbb03cf11161fcc6bc.zip
chromium_src-8707ec8224366e91d75dfbcbb03cf11161fcc6bc.tar.gz
chromium_src-8707ec8224366e91d75dfbcbb03cf11161fcc6bc.tar.bz2
Use an empty plug-in version list for ChromeOS, to avoid accidental breakage.
Review URL: http://codereview.chromium.org/6928016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/npapi/plugin_list.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index d964e2a..fb81bca 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -135,7 +135,12 @@ static const PluginGroupDefinition kGroupDefinitions[] = {
NULL, 0, "" },
};
-#else
+#elif defined(OS_CHROMEOS)
+// ChromeOS generally has (autoupdated) system plug-ins and no user-installable
+// plug-ins.
+static const PluginGroupDefinition kGroupDefinitions[] = { };
+
+#else // Most importantly, covers desktop Linux.
static const VersionRangeDefinition kJavaVersionRange[] = {
{ "0", "1.7", "1.6.0.24", true }
};