Allow downloading PDFs instead of opening them in Brave.

browser/extensions/brave_component_loader.cc

@@ -13,18 +13,30 @@
 #include "brave/components/brave_rewards/browser/buildflags/buildflags.h"
 #include "brave/components/brave_rewards/resources/extension/grit/brave_rewards_extension_resources.h"
 #include "brave/components/brave_webtorrent/grit/brave_webtorrent_resources.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/pref_names.h"
 #include "components/grit/brave_components_resources.h"
 #include "extensions/browser/extension_prefs.h"
 
 namespace extensions {
 
+//static
+bool BraveComponentLoader::IsPdfjsDisabled() {
+  const base::CommandLine& command_line =
+    *base::CommandLine::ForCurrentProcess();
+  return command_line.HasSwitch(switches::kDisablePDFJSExtension);
+}
+
 BraveComponentLoader::BraveComponentLoader(
     ExtensionServiceInterface* extension_service,
     PrefService* profile_prefs,
     PrefService* local_state,
     Profile* profile)
     : ComponentLoader(extension_service, profile_prefs, local_state, profile),
-      profile_(profile) {
+      profile_(profile),
+      profile_prefs_(profile_prefs),
+      testing_callbacks_(nullptr) {
+  ObserveOpenPdfExternallySetting();
 }
 
 BraveComponentLoader::~BraveComponentLoader() {
@@ -73,8 +85,10 @@ void BraveComponentLoader::AddDefaultComponentExtensions(
     Add(IDR_BRAVE_EXTENSON, brave_extension_path);
   }
 
-  if (!command_line.HasSwitch(switches::kDisablePDFJSExtension)) {
-    AddExtension(pdfjs_extension_id, pdfjs_extension_name, pdfjs_extension_public_key);
+  if (!profile_prefs_->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally) &&
+      !command_line.HasSwitch(switches::kDisablePDFJSExtension)) {
+    AddExtension(pdfjs_extension_id, pdfjs_extension_name,
+                 pdfjs_extension_public_key);
   }
 
 #if BUILDFLAG(BRAVE_REWARDS_ENABLED)
@@ -94,4 +108,37 @@ void BraveComponentLoader::AddDefaultComponentExtensions(
   }
 }
 
+void BraveComponentLoader::ObserveOpenPdfExternallySetting() {
+  // Observe the setting change only in regular profiles since the PDF settings
+  // page is not available in Guest/Tor profiles.
+  DCHECK(profile_ && profile_prefs_);
+  if (!profile_->IsGuestSession()) {
+    registrar_.Init(profile_prefs_);
+    registrar_.Add(prefs::kPluginsAlwaysOpenPdfExternally,
+      base::Bind(&BraveComponentLoader::UpdatePdfExtension,
+        base::Unretained(this)));
+  }
+}
+
+void BraveComponentLoader::UpdatePdfExtension(const std::string& pref_name) {
+  DCHECK(pref_name == prefs::kPluginsAlwaysOpenPdfExternally);
+  DCHECK(profile_prefs_);
+  if (profile_prefs_->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally) ||
+      IsPdfjsDisabled()) {
+    if (testing_callbacks_)
+      testing_callbacks_->OnPdfExtensionAction(TestingCallbacks::WILL_REMOVE);
+    Remove(pdfjs_extension_id);
+  } else if (!Exists(pdfjs_extension_id)) {
+    if (testing_callbacks_)
+      testing_callbacks_->OnPdfExtensionAction(TestingCallbacks::WILL_ADD);
+    AddExtension(pdfjs_extension_id, pdfjs_extension_name,
+                 pdfjs_extension_public_key);
+  }
+}
+
+void BraveComponentLoader::set_testing_callbacks(
+    TestingCallbacks* testing_callbacks) {
+  testing_callbacks_ = testing_callbacks;
+}
+
 }  // namespace extensions

browser/extensions/brave_component_loader.h

@@ -7,6 +7,9 @@
 
 #include "base/files/file_path.h"
 #include "chrome/browser/extensions/component_loader.h"
+#include "components/prefs/pref_change_registrar.h"
+
+class BravePDFExtensionTest;
 
 namespace extensions {
 
@@ -32,8 +35,29 @@ class BraveComponentLoader : public ComponentLoader {
   void AddExtension(const std::string& id,
       const std::string& name, const std::string& public_key);
 
+  static bool IsPdfjsDisabled();
+
  private:
+  friend class ::BravePDFExtensionTest;
+  void ObserveOpenPdfExternallySetting();
+  // Callback for changes to the AlwaysOpenPdfExternally setting.
+  void UpdatePdfExtension(const std::string& pref_name);
+
+  struct TestingCallbacks {
+    enum PdfExtensionAction {
+      NONE,
+      WILL_ADD,
+      WILL_REMOVE,
+    };
+    virtual void OnPdfExtensionAction(PdfExtensionAction action) = 0;
+  };
+
+  void set_testing_callbacks(TestingCallbacks* testing_callbacks);
+
   Profile* profile_;
+  PrefService* profile_prefs_;
+  PrefChangeRegistrar registrar_;
+  TestingCallbacks* testing_callbacks_;
   DISALLOW_COPY_AND_ASSIGN(BraveComponentLoader);
 };
 

browser/extensions/brave_component_loader_browsertest.cc

@@ -0,0 +1,84 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this file,
+* You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/extensions/brave_component_loader.h"
+#include "brave/browser/extensions/brave_extension_functional_test.h"
+#include "brave/common/brave_switches.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/common/pref_names.h"
+#include "components/prefs/pref_service.h"
+#include "content/public/test/browser_test_utils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using extensions::BraveComponentLoader;
+
+class BravePDFExtensionTest : public extensions::ExtensionFunctionalTest,
+                              public BraveComponentLoader::TestingCallbacks {
+ public:
+  BravePDFExtensionTest() : pdf_extension_action_(TestingCallbacks::NONE) {}
+  ~BravePDFExtensionTest() override = default;
+
+protected:
+  void SetUpOnMainThread() override {
+   extensions::ExtensionService* service =
+       extensions::ExtensionSystem::Get(profile())->extension_service();
+    DCHECK(service);
+   (static_cast<BraveComponentLoader*>(service->component_loader()))
+       ->set_testing_callbacks(this);
+  }
+
+  // BraveComponentLoader::TestingCallbacks
+  void OnPdfExtensionAction(
+      TestingCallbacks::PdfExtensionAction action) override {
+    pdf_extension_action_ = action;
+  }
+
+  void SetDownloadPDFs(bool value) {
+    DCHECK(browser());
+    profile()->GetPrefs()->SetBoolean(prefs::kPluginsAlwaysOpenPdfExternally,
+                                      value);
+  }
+
+  TestingCallbacks::PdfExtensionAction pdf_extension_action() {
+    return pdf_extension_action_;
+  }
+
+private:
+  TestingCallbacks::PdfExtensionAction pdf_extension_action_;
+};
+
+IN_PROC_BROWSER_TEST_F(BravePDFExtensionTest, ToggleDownloadPDFs) {
+  // Set preference to always download PDFs.
+  SetDownloadPDFs(true);
+  EXPECT_EQ(TestingCallbacks::WILL_REMOVE, pdf_extension_action());
+
+  // Toggle the preference to view PDFs in the browser.
+  SetDownloadPDFs(false);
+  EXPECT_EQ(TestingCallbacks::WILL_ADD, pdf_extension_action());
+}
+
+class BravePDFExtensionDisabledTest : public BravePDFExtensionTest {
+public:
+  BravePDFExtensionDisabledTest() = default;
+  ~BravePDFExtensionDisabledTest() override = default;
+
+protected:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    ExtensionFunctionalTest::SetUpCommandLine(command_line);
+    // Disable loading of our PDF extension.
+    command_line->AppendSwitch(switches::kDisablePDFJSExtension);
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(BravePDFExtensionDisabledTest, ToggleDownloadPDFs) {
+  // Set preference to always download PDFs.
+  SetDownloadPDFs(true);
+  EXPECT_EQ(TestingCallbacks::WILL_REMOVE, pdf_extension_action());
+
+  // Toggle the preference to view PDFs in the browser.
+  SetDownloadPDFs(false);
+  EXPECT_EQ(TestingCallbacks::WILL_REMOVE, pdf_extension_action());
+}

browser/ui/webui/brave_md_settings_ui.cc

@@ -4,6 +4,7 @@
 
 #include "brave/browser/ui/webui/brave_md_settings_ui.h"
 
+#include "brave/browser/extensions/brave_component_loader.h"
 #include "brave/browser/resources/grit/brave_settings_resources.h"
 #include "brave/browser/resources/grit/brave_settings_resources_map.h"
 #include "brave/browser/ui/webui/settings/brave_privacy_handler.h"
@@ -26,8 +27,11 @@ BraveMdSettingsUI::~BraveMdSettingsUI() {
 // static
 void BraveMdSettingsUI::AddResources(content::WebUIDataSource* html_source,
                                 Profile* profile) {
-for (size_t i = 0; i < kBraveSettingsResourcesSize; ++i) {
+  for (size_t i = 0; i < kBraveSettingsResourcesSize; ++i) {
     html_source->AddResourcePath(kBraveSettingsResources[i].name,
                                  kBraveSettingsResources[i].value);
   }
+
+  html_source->AddBoolean("isPdfjsDisabled",
+                          extensions::BraveComponentLoader::IsPdfjsDisabled());
 }

chromium_src/extensions/common/manifest_handlers/mime_types_handler.cc

@@ -0,0 +1,16 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this file,
+* You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "../../../../extensions/common/manifest_handlers/mime_types_handler.cc"
+
+// static
+std::vector<std::string> MimeTypesHandler::BraveGetMIMETypeWhitelist() {
+  std::vector<std::string> whitelist = MimeTypesHandler::GetMIMETypeWhitelist();
+  auto pos = std::find(whitelist.begin(), whitelist.end(),
+                       extension_misc::kPdfExtensionId);
+  if (pos != whitelist.end())
+    whitelist.erase(pos);
+  return whitelist;
+}
+