| Index: chrome/plugin/plugin_thread.cc
|
| diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
|
| index a595776a1566269f7ae12baa5b2cbce7c304f36c..7104cc23bbacd78b1175e2665e6c51d53c9900f5 100644
|
| --- a/chrome/plugin/plugin_thread.cc
|
| +++ b/chrome/plugin/plugin_thread.cc
|
| @@ -25,6 +25,9 @@
|
| #include "chrome/plugin/npobject_util.h"
|
| #include "chrome/renderer/render_thread.h"
|
| #include "net/base/net_errors.h"
|
| +#if defined(OS_LINUX)
|
| +#include "webkit/glue/plugins/flash_workarounds_linux.h"
|
| +#endif
|
| #include "webkit/glue/plugins/plugin_lib.h"
|
| #include "webkit/glue/webkit_glue.h"
|
|
|
| @@ -84,6 +87,12 @@ void PluginThread::Init() {
|
|
|
| notification_service_.reset(new NotificationService);
|
|
|
| +#if defined(OS_LINUX)
|
| + if (plugin_path_.BaseName().value() == "libflashplayer.so") {
|
| + // The flash workarounds need to be enabled before the library gets loaded.
|
| + EnableFlashWorkarounds(plugin_path_);
|
| + }
|
| +#endif
|
| // Preload the library to avoid loading, unloading then reloading
|
| preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_);
|
|
|
|
|