summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_service.cc
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/browser/plugin_service.cc
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/browser/plugin_service.cc')
-rw-r--r--chrome/browser/plugin_service.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
index 5a77ee2..6a390d0 100644
--- a/chrome/browser/plugin_service.cc
+++ b/chrome/browser/plugin_service.cc
@@ -51,7 +51,13 @@ static void NotifyPluginsOfActivation() {
// static
bool PluginService::enable_chrome_plugins_ = true;
+// Disable on Windows by default initially, but not on other platforms since
+// there's no alternative there at this point.
+#if defined(OS_WIN)
bool PluginService::enable_internal_pdf_ = false;
+#else
+bool PluginService::enable_internal_pdf_ = true;
+#endif
// static
void PluginService::InitGlobalInstance(Profile* profile) {