Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(684)

Unified Diff: chrome/common/chrome_paths.cc

Issue 893823002: Register system Pepper Flash plugin if no packaged Pepper plugin is found. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments. read location of pepperflash from registry. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/common/pepper_flash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 9537376b47f4e2e9a27908eb3342680cb287ed82..62cad66711028a971fd0b63206c7ec8c10e7370a 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -27,10 +27,20 @@
#include "base/mac/foundation_util.h"
#endif
+#if defined(OS_WIN)
+#include "base/win/registry.h"
+#endif
+
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
namespace {
+#if defined(OS_WIN)
+const wchar_t kFlashRegistryRoot[] = L"SOFTWARE\\Macromedia\\FlashPlayerPepper";
+
+const wchar_t kFlashPlayerPathValueName[] = L"PlayerPath";
+#endif
+
// File name of the internal Flash plugin on different platforms.
const base::FilePath::CharType kInternalFlashPluginFileName[] =
#if defined(OS_MACOSX)
@@ -46,8 +56,11 @@ const base::FilePath::CharType kPepperFlashBaseDirectory[] =
FILE_PATH_LITERAL("PepperFlash");
#if defined(OS_WIN)
-const base::FilePath::CharType kPepperFlashDebuggerBaseDirectory[] =
+const base::FilePath::CharType kPepperFlashSystemBaseDirectory[] =
FILE_PATH_LITERAL("Macromed\\Flash");
+#elif defined(OS_MACOSX)
+const base::FilePath::CharType kPepperFlashSystemBaseDirectory[] =
+ FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
#endif
const base::FilePath::CharType kInternalNaClPluginFileName[] =
@@ -104,6 +117,23 @@ bool GetInternalPluginsDirectory(base::FilePath* result) {
return PathService::Get(base::DIR_MODULE, result);
}
+#if defined(OS_WIN)
+// Gets the Flash path if installed on the system.
+bool GetSystemFlashDirectory(base::FilePath* out_path) {
+ base::win::RegKey path_key(HKEY_LOCAL_MACHINE, kFlashRegistryRoot, KEY_READ);
+ base::string16 path_str;
+ if (FAILED(path_key.ReadValue(kFlashPlayerPathValueName, &path_str)))
+ return false;
+ base::FilePath plugin_path = base::FilePath(path_str).DirName();
+
+ if (!base::PathExists(plugin_path))
+ return false;
+
+ *out_path = plugin_path;
+ return true;
+}
+#endif
+
} // namespace
namespace chrome {
@@ -251,16 +281,16 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
cur = cur.Append(kPepperFlashBaseDirectory);
break;
- case chrome::DIR_PEPPER_FLASH_DEBUGGER_PLUGIN:
+ case chrome::DIR_PEPPER_FLASH_SYSTEM_PLUGIN:
#if defined(OS_WIN)
- if (!PathService::Get(base::DIR_SYSTEM, &cur))
+ if (!GetSystemFlashDirectory(&cur))
return false;
- cur = cur.Append(kPepperFlashDebuggerBaseDirectory);
#elif defined(OS_MACOSX)
- // TODO(luken): finalize Mac OS directory paths, current consensus is
- // around /Library/Internet Plug-Ins/PepperFlashPlayer/
- return false;
+ if (!GetLocalLibraryDirectory(&cur))
+ return false;
+ cur = cur.Append(kPepperFlashSystemBaseDirectory);
#else
+ // TODO(wfh): If Adobe release PPAPI binaries for Linux, add support here.
return false;
#endif
break;
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/common/pepper_flash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698