| Index: chrome/common/chrome_content_client.cc
|
| diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
|
| index 52d9fc41b3fdc331b2d64b8478a9a0df6790b45e..04bbfc283e3e6e86f2a2cdcf8f04076f50075470 100644
|
| --- a/chrome/common/chrome_content_client.cc
|
| +++ b/chrome/common/chrome_content_client.cc
|
| @@ -214,8 +214,9 @@ void AddPepperFlash(std::vector<content::PepperPluginInfo>* plugins) {
|
| switches::kPpapiFlashVersion);
|
| } else {
|
| // Use the bundled Pepper Flash if it's enabled and available.
|
| - // It's currently only enabled by default on Linux x64.
|
| -#if defined(FLAPPER_AVAILABLE) && defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
|
| + // It's currently only enabled by default on Linux ia32 and x64.
|
| +#if defined(FLAPPER_AVAILABLE) && defined(OS_LINUX) && \
|
| + (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64))
|
| bool bundled_flapper_enabled = true;
|
| #else
|
| bool bundled_flapper_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
|
|
|