summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 }
};