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

Unified Diff: chrome/common/chrome_paths.cc

Issue 203993004: support loading pepper flash debugger dlls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undoing git cl format changes Created 6 years, 8 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') | no next file » | 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 e9d841f4afbeab412725d9c4e6404e895cf40eae..352b51abd1c47bf68069569562e0a892ff470a1b 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -44,6 +44,11 @@ const base::FilePath::CharType kInternalFlashPluginFileName[] =
const base::FilePath::CharType kPepperFlashBaseDirectory[] =
FILE_PATH_LITERAL("PepperFlash");
+#if defined(OS_WIN)
+const base::FilePath::CharType kPepperFlashDebuggerBaseDirectory[] =
+ FILE_PATH_LITERAL("Macromed\\Flash");
+#endif
+
// File name of the internal PDF plugin on different platforms.
const base::FilePath::CharType kInternalPDFPluginFileName[] =
#if defined(OS_WIN)
@@ -263,6 +268,19 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
cur = cur.Append(kPepperFlashBaseDirectory);
break;
+ case chrome::DIR_PEPPER_FLASH_DEBUGGER_PLUGIN:
+#if defined(OS_WIN)
+ if (!PathService::Get(base::DIR_SYSTEM, &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;
+#else
+ return false;
+#endif
+ break;
case chrome::FILE_LOCAL_STATE:
if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
return false;
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698