| Index: chrome/common/chrome_paths.cc
|
| diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
|
| index 9537376b47f4e2e9a27908eb3342680cb287ed82..bd4fae1d82c0e70ff5f93606e40bc042240126d1 100644
|
| --- a/chrome/common/chrome_paths.cc
|
| +++ b/chrome/common/chrome_paths.cc
|
| @@ -46,8 +46,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[] =
|
| @@ -251,16 +254,17 @@ 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))
|
| return false;
|
| - cur = cur.Append(kPepperFlashDebuggerBaseDirectory);
|
| + cur = cur.Append(kPepperFlashSystemBaseDirectory);
|
| #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;
|
|
|