| Index: chrome/browser/component_updater/pepper_flash_component_installer.cc
|
| ===================================================================
|
| --- chrome/browser/component_updater/pepper_flash_component_installer.cc (revision 107758)
|
| +++ chrome/browser/component_updater/pepper_flash_component_installer.cc (working copy)
|
| @@ -75,6 +75,13 @@
|
| // If we don't have a Pepper Flash component, this is the version we claim.
|
| const char kNullVersion[] = "0.0.0.0";
|
|
|
| +// True if Pepper Flash should be enabled by default.
|
| +#if defined(USE_AURA)
|
| +const bool kEnablePepperFlash = true;
|
| +#else
|
| +const bool kEnablePepperFlash = false;
|
| +#endif
|
| +
|
| // The base directory on Windows looks like:
|
| // <profile>\AppData\Local\Google\Chrome\User Data\PepperFlash\.
|
| FilePath GetPepperFlashBaseDirectory() {
|
| @@ -157,7 +164,7 @@
|
| // Register it as out-of-process and disabled.
|
| if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info))
|
| return;
|
| - PluginPrefs::EnablePluginGlobally(false, plugin_info.path);
|
| + PluginPrefs::EnablePluginGlobally(kEnablePepperFlash, plugin_info.path);
|
| webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(
|
| plugin_info.ToWebPluginInfo());
|
| webkit::npapi::PluginList::Singleton()->RefreshPlugins();
|
|
|