From bf614638ed278a41573eb0987dd65f91a004e04a Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Tue, 19 Jan 2016 05:58:28 -0500 Subject: Add the Google Chrome path for pepper Flash on Linux This is the path used when installing the official Chrome deb packages on Ubuntu. Change-Id: Iaa30c1df17ba2c6d069d17f828ecbbd26d16237b Reviewed-by: Kai Koehne --- src/core/content_client_qt.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index c8b23efab..3e5b96b41 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -118,7 +118,8 @@ void AddPepperFlashFromSystem(std::vector* plugins) pluginPaths << "/Library/Internet Plug-Ins/PepperFlashPlayer/PepperFlashPlayer.plugin"; // Mac OS X #endif #if defined(Q_OS_LINUX) - pluginPaths << "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" // Ubuntu + pluginPaths << "/opt/google/chrome/PepperFlash/libpepflashplayer.so" // Google Chrome + << "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" // Ubuntu << "/usr/lib/PepperFlash/libpepflashplayer.so" // Arch << "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so"; // OpenSuSE #endif -- cgit v1.2.3