| Index: chrome/plugin/plugin_thread.cc
|
| diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
|
| index e74e95eaa5650705f42835335d2cd5a1bf7e439b..0920c7c3d3292a6e8326e08773e888631e804368 100644
|
| --- a/chrome/plugin/plugin_thread.cc
|
| +++ b/chrome/plugin/plugin_thread.cc
|
| @@ -207,14 +207,11 @@ bool GetPluginFinderURL(std::string* plugin_finder_url) {
|
| }
|
|
|
| bool IsDefaultPluginEnabled() {
|
| -#if defined(OS_WIN)
|
| +#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;
|
| -#elif defined(OS_MACOSX)
|
| - // http://code.google.com/p/chromium/issues/detail?id=17392
|
| - return false;
|
| #endif
|
| }
|
|
|
|
|