summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins
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 /webkit/glue/plugins
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 'webkit/glue/plugins')
-rw-r--r--webkit/glue/plugins/plugin_lib_mac.mm8
1 files changed, 0 insertions, 8 deletions
diff --git a/webkit/glue/plugins/plugin_lib_mac.mm b/webkit/glue/plugins/plugin_lib_mac.mm
index b6ced70..7f24a3be 100644
--- a/webkit/glue/plugins/plugin_lib_mac.mm
+++ b/webkit/glue/plugins/plugin_lib_mac.mm
@@ -89,10 +89,6 @@ bool ReadPlistPluginInfo(const FilePath& filename, CFBundleRef bundle,
WebPluginMimeType mime;
mime.mime_type = base::SysNSStringToUTF8([mime_type lowercaseString]);
-#ifndef OS_MACOSX_ALLOW_PDF_LOADING
- if (mime.mime_type == "application/pdf")
- continue;
-#endif
if (mime_desc)
mime.description = base::SysNSStringToWide(mime_desc);
for (NSString* ext in mime_exts)
@@ -194,10 +190,6 @@ bool ReadSTRPluginInfo(const FilePath& filename, CFBundleRef bundle,
for (size_t i = 0; i < num_types; ++i) {
WebPluginMimeType mime;
mime.mime_type = StringToLowerASCII(type_strings[2*i]);
-#ifndef OS_MACOSX_ALLOW_PDF_LOADING
- if (mime.mime_type == "application/pdf")
- continue;
-#endif
if (have_type_descs && i < type_descs.size())
mime.description = UTF8ToWide(type_descs[i]);
SplitString(StringToLowerASCII(type_strings[2*i+1]), ',',