summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorjabdelmalek@google.com <jabdelmalek@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 18:17:48 +0000
committerjabdelmalek@google.com <jabdelmalek@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 18:17:48 +0000
commitc8e336ae83a60fb80872f1eeef5c1ca3742054b1 (patch)
treefa427622bab6aae4a3f2a489a203666375c5ec34 /chrome/common
parent2318c41495401b66857b659909bfee65a851f00c (diff)
downloadchromium_src-c8e336ae83a60fb80872f1eeef5c1ca3742054b1.zip
chromium_src-c8e336ae83a60fb80872f1eeef5c1ca3742054b1.tar.gz
chromium_src-c8e336ae83a60fb80872f1eeef5c1ca3742054b1.tar.bz2
Get the internal plugin working on Mac.
Review URL: http://codereview.chromium.org/2271002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_paths.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 2b98e80..5b517a1 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -237,13 +237,12 @@ bool PathProvider(int key, FilePath* result) {
return false;
break;
case chrome::FILE_PDF_PLUGIN:
- if (!PathService::Get(base::DIR_MODULE, &cur))
+ if (!GetInternalPluginsDirectory(&cur))
return false;
#if defined(OS_WIN)
cur = cur.Append(FILE_PATH_LITERAL("pdf.dll"));
#elif defined(OS_MACOSX)
- // http://crbug.com/44900
- return false;
+ cur = cur.Append(FILE_PATH_LITERAL("PDF.plugin"));
#else // Linux and Chrome OS
cur = cur.Append(FILE_PATH_LITERAL("libpdf.so"));
#endif