Add option to open PDFs in system viewer to OS X and Linux.

chrome/browser/download/download_prefs.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/download/download_prefs.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 113 matching lines @@
     }
   }
 
   // Ensure that the default download directory exists.
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(base::IgnoreResult(&base::CreateDirectory),
                  GetDefaultDownloadDirectoryForProfile()));
 #endif  // defined(OS_CHROMEOS)
 
-#if defined(OS_WIN)
-  should_open_pdf_in_adobe_reader_ =
-      prefs->GetBoolean(prefs::kOpenPdfDownloadInAdobeReader);
+#if defined(OS_WIN) || defined(OS_LINUX) || \
+    (defined(OS_MACOSX) && !defined(OS_IOS))
+  should_open_pdf_in_system_reader_ =
+      prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
 #endif
 
   // If the download path is dangerous we forcefully reset it. But if we do
   // so we set a flag to make sure we only do it once, to avoid fighting
   // the user if he really wants it on an unsafe place such as the desktop.
   if (!prefs->GetBoolean(prefs::kDownloadDirUpgraded)) {
     base::FilePath current_download_dir = prefs->GetFilePath(
         prefs::kDownloadDefaultDirectory);
     if (DownloadPathIsDangerous(current_download_dir)) {
       prefs->SetFilePath(prefs::kDownloadDefaultDirectory,
@@ skipping 50 matching lines @@
 
   const base::FilePath& default_download_path = GetDefaultDownloadDirectory();
   registry->RegisterFilePathPref(
       prefs::kDownloadDefaultDirectory,
       default_download_path,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterFilePathPref(
       prefs::kSaveFileDefaultDirectory,
       default_download_path,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX) || \
+    (defined(OS_MACOSX) && !defined(OS_IOS))
   registry->RegisterBooleanPref(
-      prefs::kOpenPdfDownloadInAdobeReader,
+      prefs::kOpenPdfDownloadInSystemReader,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif
 }
 
 base::FilePath DownloadPrefs::GetDefaultDownloadDirectoryForProfile() const {
 #if defined(OS_CHROMEOS)
   return file_manager::util::GetDownloadsFolderForProfile(profile_);
 #else
   return GetDefaultDownloadDirectory();
@@ skipping 57 matching lines @@
   // always be false.
   DCHECK(!download_path_.IsManaged() || !prompt_for_download_.GetValue());
   return *prompt_for_download_;
 }
 
 bool DownloadPrefs::IsDownloadPathManaged() const {
   return download_path_.IsManaged();
 }
 
 bool DownloadPrefs::IsAutoOpenUsed() const {
-#if defined(OS_WIN)
-  if (ShouldOpenPdfInAdobeReader())
+#if defined(OS_WIN) || defined(OS_LINUX) || \
+      (defined(OS_MACOSX) && !defined(OS_IOS))
+  if (ShouldOpenPdfInSystemReader())
     return true;
 #endif
   return !auto_open_.empty();
 }
 
 bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
     const base::FilePath& path) const {
   base::FilePath::StringType extension = path.Extension();
   if (extension.empty())
     return false;
   DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
   extension.erase(0, 1);
-#if defined(OS_WIN)
-  if (extension == FILE_PATH_LITERAL("pdf") &&
-      DownloadTargetDeterminer::IsAdobeReaderUpToDate() &&
-      ShouldOpenPdfInAdobeReader())
+#if defined(OS_WIN) || defined(OS_LINUX) || \
+    (defined(OS_MACOSX) && !defined(OS_IOS))
+  if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
     return true;
 #endif
   return auto_open_.find(extension) != auto_open_.end();
 }
 
 bool DownloadPrefs::EnableAutoOpenBasedOnExtension(
     const base::FilePath& file_name) {
   base::FilePath::StringType extension = file_name.Extension();
   if (extension.empty())
     return false;
   DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
   extension.erase(0, 1);
 
   auto_open_.insert(extension);
   SaveAutoOpenState();
   return true;
 }
 
 void DownloadPrefs::DisableAutoOpenBasedOnExtension(
     const base::FilePath& file_name) {
   base::FilePath::StringType extension = file_name.Extension();
   if (extension.empty())
     return;
   DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
   extension.erase(0, 1);
   auto_open_.erase(extension);
   SaveAutoOpenState();
 }
 
-#if defined(OS_WIN)
-void DownloadPrefs::SetShouldOpenPdfInAdobeReader(bool should_open) {
-  if (should_open_pdf_in_adobe_reader_ == should_open)
+#if defined(OS_WIN) || defined(OS_LINUX) || \
+    (defined(OS_MACOSX) && !defined(OS_IOS))
+void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
+  if (should_open_pdf_in_system_reader_ == should_open)
     return;
-  should_open_pdf_in_adobe_reader_ = should_open;
-  profile_->GetPrefs()->SetBoolean(prefs::kOpenPdfDownloadInAdobeReader,
+  should_open_pdf_in_system_reader_ = should_open;
+  profile_->GetPrefs()->SetBoolean(prefs::kOpenPdfDownloadInSystemReader,
                                    should_open);
 }
 
-bool DownloadPrefs::ShouldOpenPdfInAdobeReader() const {
-  return should_open_pdf_in_adobe_reader_;
+bool DownloadPrefs::ShouldOpenPdfInSystemReader() const {
+#if defined(OS_WIN)
+  if (!DownloadTargetDeterminer::IsAdobeReaderUpToDate())

[asanka, 2014/10/28 21:32:50]

if (<is adobe the default reader> && IsAdobeReaderUpToDate())

For the case where Adobe reader is not the default, DTD::IsAdobeReaderUpToDate()
is always false.

[palmer, 2014/10/28 22:38:39]

Done.

+      return false;
+#endif
+  return should_open_pdf_in_system_reader_;
 }
 #endif
 
 void DownloadPrefs::ResetAutoOpen() {
-#if defined(OS_WIN)
-  SetShouldOpenPdfInAdobeReader(false);
+#if defined(OS_WIN) || defined(OS_LINUX) || \
+    (defined(OS_MACOSX) && !defined(OS_IOS))
+  SetShouldOpenPdfInSystemReader(false);
 #endif
   auto_open_.clear();
   SaveAutoOpenState();
 }
 
 void DownloadPrefs::SaveAutoOpenState() {
   std::string extensions;
   for (AutoOpenSet::iterator it = auto_open_.begin();
        it != auto_open_.end(); ++it) {
 #if defined(OS_POSIX)
     std::string this_extension = *it;
 #elif defined(OS_WIN)
     // TODO(phajdan.jr): Why we're using Sys conversion here, but not in ctor?
     std::string this_extension = base::SysWideToUTF8(*it);
 #endif
     extensions += this_extension + ":";
   }
   if (!extensions.empty())
     extensions.erase(extensions.size() - 1);
 
   profile_->GetPrefs()->SetString(prefs::kDownloadExtensionsToOpen, extensions);
 }
 
 bool DownloadPrefs::AutoOpenCompareFunctor::operator()(
     const base::FilePath::StringType& a,
     const base::FilePath::StringType& b) const {
   return base::FilePath::CompareLessIgnoreCase(a, b);
 }