summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/plugin_thread.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index e4fd235..0920c7c 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -207,7 +207,12 @@ bool GetPluginFinderURL(std::string* plugin_finder_url) {
}
bool IsDefaultPluginEnabled() {
+#if defined(OS_WIN) || defined(OS_MACOSX)
return true;
+#elif defined(OS_LINUX)
+ // http://code.google.com/p/chromium/issues/detail?id=10952
+ return false;
+#endif
}
// Dispatch the resolve proxy resquest to the right code, depending on which