bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cef/patch/patches/content_pepper_flash_1586.p...

14 lines
657 B
Diff
Raw Normal View History

Add Pepper Flash plugin support (issue #1586). A system-wide installation of the Pepper Flash plugin is available from Adobe for Windows and Mac OS X platforms as a separate download. To enable automatic detection and loading of the system-wide installation pass the `--enable-system-flash` command-line flag. The Pepper Flash plugin can also be loaded by specifying the file path and version via the `--ppapi-flash-path=<path> --ppapi-flash-version=<version>` command-line flags. The version can be identified by viewing the manifest.json file in the same directory as the Pepper Flash plugin library.
2015-03-25 22:22:47 +01:00
diff --git pepper_flash_file_message_filter.cc pepper_flash_file_message_filter.cc
Update to Chromium revision d7d5682a (#367535)
2016-01-06 20:20:54 +01:00
index 3059dd7..b327be5 100644
Add Pepper Flash plugin support (issue #1586). A system-wide installation of the Pepper Flash plugin is available from Adobe for Windows and Mac OS X platforms as a separate download. To enable automatic detection and loading of the system-wide installation pass the `--enable-system-flash` command-line flag. The Pepper Flash plugin can also be loaded by specifying the file path and version via the `--ppapi-flash-path=<path> --ppapi-flash-version=<version>` command-line flags. The version can be identified by viewing the manifest.json file in the same directory as the Pepper Flash plugin library.
2015-03-25 22:22:47 +01:00
--- pepper_flash_file_message_filter.cc
+++ pepper_flash_file_message_filter.cc
Update to Chromium revision d7d5682a (#367535)
2016-01-06 20:20:54 +01:00
@@ -55,7 +55,7 @@ PepperFlashFileMessageFilter::PepperFlashFileMessageFilter(
Add Pepper Flash plugin support (issue #1586). A system-wide installation of the Pepper Flash plugin is available from Adobe for Windows and Mac OS X platforms as a separate download. To enable automatic detection and loading of the system-wide installation pass the `--enable-system-flash` command-line flag. The Pepper Flash plugin can also be loaded by specifying the file path and version via the `--ppapi-flash-path=<path> --ppapi-flash-version=<version>` command-line flags. The version can be identified by viewing the manifest.json file in the same directory as the Pepper Flash plugin library.
2015-03-25 22:22:47 +01:00
// will construct a bad path and could provide access to the wrong files.
// In this case, |plugin_data_directory_| will remain unset and
// |ValidateAndConvertPepperFilePath| will fail.
- NOTREACHED();
+ //NOTREACHED();
} else {
plugin_data_directory_ = GetDataDirName(profile_data_directory).Append(
base::FilePath::FromUTF8Unsafe(plugin_name));