mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
remove pdf plugin name patch
This commit is contained in:
@@ -24,9 +24,9 @@
|
||||
void BookmarkTabHelper::AddObserver(BookmarkTabHelperObserver* observer) {
|
||||
--- a/chrome/browser/ungoogled_flag_choices.h
|
||||
+++ b/chrome/browser/ungoogled_flag_choices.h
|
||||
@@ -39,4 +39,10 @@ const FeatureEntry::Choice kPDFPluginNam
|
||||
{"Google Chrome", switches::kPDFPluginName, "chrome"},
|
||||
{"Microsoft Edge", switches::kPDFPluginName, "edge"},
|
||||
@@ -34,4 +34,10 @@ const FeatureEntry::Choice kScrollEventChangesTab[] = {
|
||||
"scroll-tabs",
|
||||
"never"}
|
||||
};
|
||||
+const FeatureEntry::Choice kBookmarkBarNewTab[] = {
|
||||
+ {flags_ui::kGenericExperimentChoiceDefault, "", ""},
|
||||
@@ -37,10 +37,10 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -40,4 +40,8 @@
|
||||
"Set internal PDF plugin name",
|
||||
"Sets the internal PDF viewer plugin name. Useful for sites that probe JS API navigator.plugins. ungoogled-chromium flag.",
|
||||
kOsDesktop, MULTI_VALUE_TYPE(kPDFPluginNameChoices)},
|
||||
@@ -36,4 +36,8 @@
|
||||
"Scroll switches tab",
|
||||
"Switch to the left/right tab if the wheel-scroll happens over the tabstrip, or the empty space beside the tabstrip. ungoogled-chromium flag.",
|
||||
kOsDesktop, MULTI_VALUE_TYPE(kScrollEventChangesTab)},
|
||||
+ {"bookmark-bar-ntp",
|
||||
+ "Bookmark Bar on New-Tab-Page",
|
||||
+ "Disable the Bookmark Bar on the New-Tab-Page. ungoogled-chromium flag.",
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
// Override values for the bounds of the window and its maximized or minimized
|
||||
--- a/chrome/browser/ungoogled_flag_choices.h
|
||||
+++ b/chrome/browser/ungoogled_flag_choices.h
|
||||
@@ -66,4 +66,13 @@ const FeatureEntry::Choice kCloseWindowW
|
||||
@@ -61,4 +61,13 @@ const FeatureEntry::Choice kCloseWindowW
|
||||
"close-window-with-last-tab",
|
||||
"never"},
|
||||
};
|
||||
@@ -175,7 +175,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -76,4 +76,8 @@
|
||||
@@ -72,4 +72,8 @@
|
||||
"Remove Grab Handle",
|
||||
"Removes the reserved empty space in the tabstrip for moving the window. ungoogled-chromium flag",
|
||||
kOsDesktop, SINGLE_VALUE_TYPE("remove-grab-handle")},
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
url::Component scheme;
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -80,4 +80,8 @@
|
||||
@@ -76,4 +76,8 @@
|
||||
"Close Confirmation",
|
||||
"Show a warning prompt when closing the browser window. ungoogled-chromium flag",
|
||||
kOsDesktop, MULTI_VALUE_TYPE(kCloseConfirmation)},
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
};
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -72,4 +72,8 @@
|
||||
@@ -68,4 +68,8 @@
|
||||
"Disable QR Generator",
|
||||
"Disables the QR generator for sharing page links. ungoogled-chromium flag",
|
||||
kOsDesktop, FEATURE_VALUE_TYPE(kDisableQRGenerator)},
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ungoogled_flag_choices.h
|
||||
+++ b/chrome/browser/ungoogled_flag_choices.h
|
||||
@@ -45,4 +45,19 @@ const FeatureEntry::Choice kBookmarkBarN
|
||||
@@ -40,4 +40,19 @@ const FeatureEntry::Choice kBookmarkBarN
|
||||
"bookmark-bar-ntp",
|
||||
"never"},
|
||||
};
|
||||
@@ -22,7 +22,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -44,4 +44,8 @@
|
||||
@@ -40,4 +40,8 @@
|
||||
"Bookmark Bar on New-Tab-Page",
|
||||
"Disable the Bookmark Bar on the New-Tab-Page. ungoogled-chromium flag.",
|
||||
kOsDesktop, MULTI_VALUE_TYPE(kBookmarkBarNewTab)},
|
||||
|
||||
@@ -1,389 +0,0 @@
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -6068,7 +6068,7 @@ bool ChromeContentBrowserClient::ShouldA
|
||||
const url::Origin& embedder_origin,
|
||||
const content::PepperPluginInfo& plugin_info) {
|
||||
#if BUILDFLAG(ENABLE_PDF)
|
||||
- if (plugin_info.name == ChromeContentClient::kPDFInternalPluginName) {
|
||||
+ if (plugin_info.name == ChromeContentClient::GetPDFInternalPluginName()) {
|
||||
return IsPdfInternalPluginAllowedOrigin(embedder_origin);
|
||||
}
|
||||
#endif // BUILDFLAG(ENABLE_PDF)
|
||||
--- a/chrome/browser/pdf/pdf_extension_util.cc
|
||||
+++ b/chrome/browser/pdf/pdf_extension_util.cc
|
||||
@@ -170,7 +170,7 @@ std::string GetManifest() {
|
||||
DCHECK(manifest_contents.find(kNameTag) != std::string::npos);
|
||||
base::ReplaceFirstSubstringAfterOffset(
|
||||
&manifest_contents, 0, kNameTag,
|
||||
- ChromeContentClient::kPDFExtensionPluginName);
|
||||
+ ChromeContentClient::GetPDFExtensionPluginName());
|
||||
|
||||
return manifest_contents;
|
||||
}
|
||||
--- a/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
|
||||
+++ b/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
|
||||
@@ -67,7 +67,7 @@ class PDFIFrameNavigationThrottleTest :
|
||||
// Register a fake PDF Viewer plugin into our plugin service.
|
||||
content::WebPluginInfo info;
|
||||
info.name =
|
||||
- base::ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName);
|
||||
+ base::ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName());
|
||||
info.mime_types.push_back(content::WebPluginMimeType(
|
||||
kPDFMimeType, "pdf", "Fake PDF description"));
|
||||
plugin_service->RegisterInternalPlugin(info, true);
|
||||
--- a/chrome/browser/plugins/plugin_prefs.cc
|
||||
+++ b/chrome/browser/plugins/plugin_prefs.cc
|
||||
@@ -40,7 +40,7 @@ bool IsPDFViewerPlugin(const std::u16str
|
||||
// plugin, which is also used for Print Preview. Note that only the PDF viewer
|
||||
// and Print Preview can create the internal PDF plugin in the first place.
|
||||
return plugin_name ==
|
||||
- base::ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName);
|
||||
+ base::ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName());
|
||||
}
|
||||
|
||||
} // namespace
|
||||
--- a/chrome/browser/plugins/plugin_prefs_unittest.cc
|
||||
+++ b/chrome/browser/plugins/plugin_prefs_unittest.cc
|
||||
@@ -24,11 +24,11 @@ class PluginPrefsTest : public ::testing
|
||||
TEST_F(PluginPrefsTest, AlwaysOpenPdfExternally) {
|
||||
EXPECT_EQ(PluginPrefs::NO_POLICY,
|
||||
plugin_prefs_->PolicyStatusForPlugin(base::ASCIIToUTF16(
|
||||
- ChromeContentClient::kPDFExtensionPluginName)));
|
||||
+ ChromeContentClient::GetPDFExtensionPluginName())));
|
||||
|
||||
SetAlwaysOpenPdfExternally(true);
|
||||
|
||||
EXPECT_EQ(PluginPrefs::POLICY_DISABLED,
|
||||
plugin_prefs_->PolicyStatusForPlugin(base::ASCIIToUTF16(
|
||||
- ChromeContentClient::kPDFExtensionPluginName)));
|
||||
+ ChromeContentClient::GetPDFExtensionPluginName())));
|
||||
}
|
||||
--- a/chrome/browser/resources/plugin_metadata/plugins_chromeos.json
|
||||
+++ b/chrome/browser/resources/plugin_metadata/plugins_chromeos.json
|
||||
@@ -44,6 +44,19 @@
|
||||
"name": "Chrome PDF Viewer",
|
||||
"group_name_matcher": "*Chrome PDF Viewer*"
|
||||
},
|
||||
+ "microsoft-edge-pdf": {
|
||||
+ "mime_types": [
|
||||
+ ],
|
||||
+ "versions": [
|
||||
+ {
|
||||
+ "version": "0",
|
||||
+ "status": "fully_trusted",
|
||||
+ "comment": "Microsoft Edge PDF has no version information."
|
||||
+ }
|
||||
+ ],
|
||||
+ "name": "Microsoft Edge PDF Viewer",
|
||||
+ "group_name_matcher": "*Microsoft Edge PDF Viewer*"
|
||||
+ },
|
||||
"chromium-pdf": {
|
||||
"mime_types": [
|
||||
],
|
||||
@@ -70,6 +83,19 @@
|
||||
"name": "Chrome PDF Plugin",
|
||||
"group_name_matcher": "*Chrome PDF Plugin*"
|
||||
},
|
||||
+ "microsoft-edge-pdf-plugin": {
|
||||
+ "mime_types": [
|
||||
+ ],
|
||||
+ "versions": [
|
||||
+ {
|
||||
+ "version": "0",
|
||||
+ "status": "fully_trusted",
|
||||
+ "comment": "Microsoft Edge PDF Plugin has no version information."
|
||||
+ }
|
||||
+ ],
|
||||
+ "name": "Microsoft Edge PDF Plugin",
|
||||
+ "group_name_matcher": "*Microsoft Edge PDF Plugin*"
|
||||
+ },
|
||||
"chromium-pdf-plugin": {
|
||||
"mime_types": [
|
||||
],
|
||||
--- a/chrome/browser/resources/plugin_metadata/plugins_linux.json
|
||||
+++ b/chrome/browser/resources/plugin_metadata/plugins_linux.json
|
||||
@@ -36,6 +36,19 @@
|
||||
"name": "Chrome PDF Viewer",
|
||||
"group_name_matcher": "*Chrome PDF Viewer*"
|
||||
},
|
||||
+ "microsoft-edge-pdf": {
|
||||
+ "mime_types": [
|
||||
+ ],
|
||||
+ "versions": [
|
||||
+ {
|
||||
+ "version": "0",
|
||||
+ "status": "fully_trusted",
|
||||
+ "comment": "Microsoft Edge PDF has no version information."
|
||||
+ }
|
||||
+ ],
|
||||
+ "name": "Microsoft Edge PDF Viewer",
|
||||
+ "group_name_matcher": "*Microsoft Edge PDF Viewer*"
|
||||
+ },
|
||||
"chromium-pdf": {
|
||||
"mime_types": [
|
||||
],
|
||||
@@ -62,6 +75,19 @@
|
||||
"name": "Chrome PDF Plugin",
|
||||
"group_name_matcher": "*Chrome PDF Plugin*"
|
||||
},
|
||||
+ "microsoft-edge-pdf-plugin": {
|
||||
+ "mime_types": [
|
||||
+ ],
|
||||
+ "versions": [
|
||||
+ {
|
||||
+ "version": "0",
|
||||
+ "status": "fully_trusted",
|
||||
+ "comment": "Google Chrome PDF Plugin has no version information."
|
||||
+ }
|
||||
+ ],
|
||||
+ "name": "Microsoft Edge PDF Plugin",
|
||||
+ "group_name_matcher": "*Microsoft Edge PDF Plugin*"
|
||||
+ },
|
||||
"chromium-pdf-plugin": {
|
||||
"mime_types": [
|
||||
],
|
||||
--- a/chrome/browser/resources/plugin_metadata/plugins_mac.json
|
||||
+++ b/chrome/browser/resources/plugin_metadata/plugins_mac.json
|
||||
@@ -33,6 +33,19 @@
|
||||
"name": "Chrome PDF Viewer",
|
||||
"group_name_matcher": "*Chrome PDF Viewer*"
|
||||
},
|
||||
+ "microsoft-edge-pdf": {
|
||||
+ "mime_types": [
|
||||
+ ],
|
||||
+ "versions": [
|
||||
+ {
|
||||
+ "version": "0",
|
||||
+ "status": "fully_trusted",
|
||||
+ "comment": "Microsoft Edge PDF Viewer has no version information."
|
||||
+ }
|
||||
+ ],
|
||||
+ "name": "Microsoft Edge PDF Viewer",
|
||||
+ "group_name_matcher": "*Microsoft Edge PDF Viewer*"
|
||||
+ },
|
||||
"chromium-pdf": {
|
||||
"mime_types": [
|
||||
],
|
||||
@@ -59,6 +72,19 @@
|
||||
"name": "Chrome PDF Plugin",
|
||||
"group_name_matcher": "*Chrome PDF Plugin*"
|
||||
},
|
||||
+ "microsoft-edge-pdf-plugin": {
|
||||
+ "mime_types": [
|
||||
+ ],
|
||||
+ "versions": [
|
||||
+ {
|
||||
+ "version": "0",
|
||||
+ "status": "fully_trusted",
|
||||
+ "comment": "Microsoft Edge PDF Plugin has no version information."
|
||||
+ }
|
||||
+ ],
|
||||
+ "name": "Microsoft Edge PDF Plugin",
|
||||
+ "group_name_matcher": "*Microsoft Edge PDF Plugin*"
|
||||
+ },
|
||||
"chromium-pdf-plugin": {
|
||||
"mime_types": [
|
||||
],
|
||||
--- a/chrome/browser/resources/plugin_metadata/plugins_win.json
|
||||
+++ b/chrome/browser/resources/plugin_metadata/plugins_win.json
|
||||
@@ -33,6 +33,19 @@
|
||||
"name": "Chrome PDF Viewer",
|
||||
"group_name_matcher": "*Chrome PDF Viewer*"
|
||||
},
|
||||
+ "microsoft-edge-pdf": {
|
||||
+ "mime_types": [
|
||||
+ ],
|
||||
+ "versions": [
|
||||
+ {
|
||||
+ "version": "0",
|
||||
+ "status": "fully_trusted",
|
||||
+ "comment": "Microsoft Edge PDF Viewer has no version information."
|
||||
+ }
|
||||
+ ],
|
||||
+ "name": "Microsoft Edge PDF Viewer",
|
||||
+ "group_name_matcher": "*Microsoft Edge PDF Viewer*"
|
||||
+ },
|
||||
"chromium-pdf": {
|
||||
"mime_types": [
|
||||
],
|
||||
@@ -59,6 +72,19 @@
|
||||
"name": "Chrome PDF Plugin",
|
||||
"group_name_matcher": "*Chrome PDF Plugin*"
|
||||
},
|
||||
+ "microsoft-edge-pdf-plugin": {
|
||||
+ "mime_types": [
|
||||
+ ],
|
||||
+ "versions": [
|
||||
+ {
|
||||
+ "version": "0",
|
||||
+ "status": "fully_trusted",
|
||||
+ "comment": "Microsoft Edge PDF Plugin has no version information."
|
||||
+ }
|
||||
+ ],
|
||||
+ "name": "Microsoft Edge PDF Plugin",
|
||||
+ "group_name_matcher": "*Microsoft Edge PDF Plugin*"
|
||||
+ },
|
||||
"chromium-pdf-plugin": {
|
||||
"mime_types": [
|
||||
],
|
||||
--- a/chrome/browser/ungoogled_flag_choices.h
|
||||
+++ b/chrome/browser/ungoogled_flag_choices.h
|
||||
@@ -34,4 +34,9 @@ const FeatureEntry::Choice kScrollEventC
|
||||
"scroll-tabs",
|
||||
"never"}
|
||||
};
|
||||
+const FeatureEntry::Choice kPDFPluginNameChoices[] = {
|
||||
+ {"Chromium", "", ""},
|
||||
+ {"Google Chrome", switches::kPDFPluginName, "chrome"},
|
||||
+ {"Microsoft Edge", switches::kPDFPluginName, "edge"},
|
||||
+};
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -36,4 +36,8 @@
|
||||
"Scroll switches tab",
|
||||
"Switch to the left/right tab if the wheel-scroll happens over the tabstrip, or the empty space beside the tabstrip. ungoogled-chromium flag.",
|
||||
kOsDesktop, MULTI_VALUE_TYPE(kScrollEventChangesTab)},
|
||||
+ {"pdf-plugin-name",
|
||||
+ "Set internal PDF plugin name",
|
||||
+ "Sets the internal PDF viewer plugin name. Useful for sites that probe JS API navigator.plugins. ungoogled-chromium flag.",
|
||||
+ kOsDesktop, MULTI_VALUE_TYPE(kPDFPluginNameChoices)},
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/chrome/common/BUILD.gn
|
||||
+++ b/chrome/common/BUILD.gn
|
||||
@@ -246,6 +246,7 @@ static_library("common") {
|
||||
"//components/no_state_prefetch/common",
|
||||
"//components/no_state_prefetch/common:mojo_bindings",
|
||||
"//components/page_load_metrics/common:common",
|
||||
+ "//components/ungoogled:ungoogled_switches",
|
||||
]
|
||||
|
||||
if (enable_pdf) {
|
||||
--- a/chrome/common/chrome_content_client.cc
|
||||
+++ b/chrome/common/chrome_content_client.cc
|
||||
@@ -126,7 +126,7 @@ void ComputeBuiltInPlugins(std::vector<c
|
||||
content::PepperPluginInfo pdf_info;
|
||||
pdf_info.is_internal = true;
|
||||
pdf_info.is_out_of_process = true;
|
||||
- pdf_info.name = ChromeContentClient::kPDFInternalPluginName;
|
||||
+ pdf_info.name = ChromeContentClient::GetPDFInternalPluginName();
|
||||
pdf_info.description = kPDFPluginDescription;
|
||||
pdf_info.path = base::FilePath(ChromeContentClient::kPDFPluginPath);
|
||||
content::WebPluginMimeType pdf_mime_type(
|
||||
--- a/chrome/common/chrome_content_client.h
|
||||
+++ b/chrome/common/chrome_content_client.h
|
||||
@@ -41,8 +41,8 @@ class ChromeContentClient : public conte
|
||||
static const base::FilePath::CharType kNaClPluginFileName[];
|
||||
#endif
|
||||
|
||||
- static const char kPDFExtensionPluginName[];
|
||||
- static const char kPDFInternalPluginName[];
|
||||
+ static const char *GetPDFExtensionPluginName();
|
||||
+ static const char *GetPDFInternalPluginName();
|
||||
static const base::FilePath::CharType kPDFPluginPath[];
|
||||
|
||||
ChromeContentClient();
|
||||
--- a/chrome/common/chrome_content_client_constants.cc
|
||||
+++ b/chrome/common/chrome_content_client_constants.cc
|
||||
@@ -2,8 +2,12 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
+#include <string>
|
||||
+
|
||||
+#include "base/command_line.h"
|
||||
#include "build/branding_buildflags.h"
|
||||
#include "chrome/common/chrome_content_client.h"
|
||||
+#include "components/ungoogled/ungoogled_switches.h"
|
||||
|
||||
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
const base::FilePath::CharType ChromeContentClient::kNotPresent[] =
|
||||
@@ -15,15 +19,52 @@ const base::FilePath::CharType ChromeCon
|
||||
FILE_PATH_LITERAL("internal-nacl-plugin");
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
-const char ChromeContentClient::kPDFExtensionPluginName[] = "Chrome PDF Viewer";
|
||||
-const char ChromeContentClient::kPDFInternalPluginName[] = "Chrome PDF Plugin";
|
||||
-#else
|
||||
-const char ChromeContentClient::kPDFExtensionPluginName[] =
|
||||
+namespace {
|
||||
+
|
||||
+const char kChromePDFExtensionPluginName[] =
|
||||
+ "Chrome PDF Viewer";
|
||||
+const char kChromePDFInternalPluginName[] =
|
||||
+ "Chrome PDF Plugin";
|
||||
+const char kEdgePDFExtensionPluginName[] =
|
||||
+ "Microsoft Edge PDF Viewer";
|
||||
+const char kEdgePDFInternalPluginName[] =
|
||||
+ "Microsoft Edge PDF Plugin";
|
||||
+const char kChromiumPDFExtensionPluginName[] =
|
||||
"Chromium PDF Viewer";
|
||||
-const char ChromeContentClient::kPDFInternalPluginName[] =
|
||||
+const char kChromiumPDFInternalPluginName[] =
|
||||
"Chromium PDF Plugin";
|
||||
-#endif
|
||||
+
|
||||
+} // namespace
|
||||
+
|
||||
+// static
|
||||
+const char *ChromeContentClient::GetPDFExtensionPluginName() {
|
||||
+ const base::CommandLine& command_line =
|
||||
+ *base::CommandLine::ForCurrentProcess();
|
||||
+ if (command_line.HasSwitch(switches::kPDFPluginName)) {
|
||||
+ std::string switch_value = command_line.GetSwitchValueASCII(switches::kPDFPluginName);
|
||||
+ if (switch_value == "edge") {
|
||||
+ return kEdgePDFExtensionPluginName;
|
||||
+ } else if (switch_value == "chrome") {
|
||||
+ return kChromePDFExtensionPluginName;
|
||||
+ }
|
||||
+ }
|
||||
+ return kChromiumPDFExtensionPluginName;
|
||||
+}
|
||||
+
|
||||
+// static
|
||||
+const char *ChromeContentClient::GetPDFInternalPluginName() {
|
||||
+ const base::CommandLine& command_line =
|
||||
+ *base::CommandLine::ForCurrentProcess();
|
||||
+ if (command_line.HasSwitch(switches::kPDFPluginName)) {
|
||||
+ std::string switch_value = command_line.GetSwitchValueASCII(switches::kPDFPluginName);
|
||||
+ if (switch_value == "edge") {
|
||||
+ return kEdgePDFInternalPluginName;
|
||||
+ } else if (switch_value == "chrome") {
|
||||
+ return kChromePDFInternalPluginName;
|
||||
+ }
|
||||
+ }
|
||||
+ return kChromiumPDFInternalPluginName;
|
||||
+}
|
||||
|
||||
const base::FilePath::CharType ChromeContentClient::kPDFPluginPath[] =
|
||||
FILE_PATH_LITERAL("internal-pdf-viewer");
|
||||
--- a/chrome/renderer/chrome_content_renderer_client.cc
|
||||
+++ b/chrome/renderer/chrome_content_renderer_client.cc
|
||||
@@ -1027,7 +1027,7 @@ WebPlugin* ChromeContentRendererClient::
|
||||
}
|
||||
}
|
||||
} else if (info.name ==
|
||||
- ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName)) {
|
||||
+ ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName())) {
|
||||
// Report PDF load metrics. Since the PDF plugin is comprised of an
|
||||
// extension that loads a second plugin, avoid double counting by
|
||||
// ignoring the creation of the second plugin.
|
||||
@@ -1059,7 +1059,7 @@ WebPlugin* ChromeContentRendererClient::
|
||||
|
||||
#if BUILDFLAG(ENABLE_PDF)
|
||||
if (info.name ==
|
||||
- ASCIIToUTF16(ChromeContentClient::kPDFInternalPluginName)) {
|
||||
+ ASCIIToUTF16(ChromeContentClient::GetPDFInternalPluginName())) {
|
||||
return pdf::CreateInternalPlugin(
|
||||
info, std::move(params), render_frame,
|
||||
std::make_unique<ChromePdfInternalPluginDelegate>());
|
||||
@@ -1072,7 +1072,7 @@ WebPlugin* ChromeContentRendererClient::
|
||||
PluginUMAReporter::GetInstance()->ReportPluginDisabled(orig_mime_type,
|
||||
url);
|
||||
if (info.name ==
|
||||
- ASCIIToUTF16(ChromeContentClient::kPDFExtensionPluginName)) {
|
||||
+ ASCIIToUTF16(ChromeContentClient::GetPDFExtensionPluginName())) {
|
||||
ReportPDFLoadStatus(
|
||||
PDFLoadStatus::kShowedDisabledPluginPlaceholderForEmbeddedPdf);
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
if (base::FeatureList::IsEnabled(kWebOTPCrossDevice))
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -68,4 +68,8 @@
|
||||
@@ -64,4 +64,8 @@
|
||||
"Remove Tabsearch Button",
|
||||
"Removes the tabsearch button from the tabstrip. ungoogled-chromium flag",
|
||||
kOsDesktop, SINGLE_VALUE_TYPE("remove-tabsearch-button")},
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
// hover card should not be visible at this time.
|
||||
--- a/chrome/browser/ungoogled_flag_choices.h
|
||||
+++ b/chrome/browser/ungoogled_flag_choices.h
|
||||
@@ -75,4 +75,13 @@ const FeatureEntry::Choice kCloseConfirm
|
||||
@@ -70,4 +70,13 @@ const FeatureEntry::Choice kCloseConfirm
|
||||
"close-confirmation",
|
||||
"multiple"},
|
||||
};
|
||||
@@ -54,7 +54,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -84,4 +84,8 @@
|
||||
@@ -80,4 +80,8 @@
|
||||
"Custom New Tab Page",
|
||||
"Allows setting a custom URL for the new tab page. Value can be internal (e.g. `about:blank`), external (e.g. `example.com`), or local (e.g. `file:///tmp/startpage.html`). This applies for incognito windows as well when not set to a `chrome://` internal page. ungoogled-chromium flag",
|
||||
kOsDesktop, ORIGIN_LIST_VALUE_TYPE("custom-ntp", "")},
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
l10n_util::GetStringUTF16(IDS_TOOLTIP_TAB_SEARCH));
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -64,4 +64,8 @@
|
||||
@@ -60,4 +60,8 @@
|
||||
"Clear data on exit",
|
||||
"Clears all browsing data on exit. ungoogled-chromium flag",
|
||||
kOsDesktop, FEATURE_VALUE_TYPE(browsing_data::features::kClearDataOnExit)},
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
Profile* profile = Profile::FromBrowserContext(context);
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -60,4 +60,8 @@
|
||||
@@ -56,4 +56,8 @@
|
||||
"Keep old history",
|
||||
"Keep history older than 3 months. ungoogled-chromium flag",
|
||||
kOsAll, SINGLE_VALUE_TYPE("keep-old-history")},
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
if (closing_all) {
|
||||
--- a/chrome/browser/ungoogled_flag_choices.h
|
||||
+++ b/chrome/browser/ungoogled_flag_choices.h
|
||||
@@ -60,4 +60,10 @@ const FeatureEntry::Choice kOmniboxAutoc
|
||||
@@ -55,4 +55,10 @@ const FeatureEntry::Choice kOmniboxAutoc
|
||||
"omnibox-autocomplete-filtering",
|
||||
"search-bookmarks-chrome"},
|
||||
};
|
||||
@@ -34,7 +34,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -48,4 +48,8 @@
|
||||
@@ -44,4 +44,8 @@
|
||||
"Omnibox Autocomplete Filtering",
|
||||
"Restrict omnibox autocomplete results to a combination of search suggestions (if enabled), bookmarks, and internal chrome pages. ungoogled-chromium flag.",
|
||||
kOsAll, MULTI_VALUE_TYPE(kOmniboxAutocompleteFiltering)},
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -52,4 +52,8 @@
|
||||
@@ -48,4 +48,8 @@
|
||||
"Close window with last tab",
|
||||
"Determines whether a window should close once the last tab is closed. ungoogled-chromium flag.",
|
||||
kOsDesktop, MULTI_VALUE_TYPE(kCloseWindowWithLastTab)},
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -56,4 +56,8 @@
|
||||
@@ -52,4 +52,8 @@
|
||||
"Popups to tabs",
|
||||
"Makes popups open in new tabs. ungoogled-chromium flag",
|
||||
kOsAll, SINGLE_VALUE_TYPE("popups-to-tabs")},
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -88,4 +88,8 @@
|
||||
@@ -84,4 +84,8 @@
|
||||
"Tab Hover Cards",
|
||||
"Allows removing the tab hover cards or using a tooltip as a replacement. ungoogled-chromium flag.",
|
||||
kOsDesktop, MULTI_VALUE_TYPE(kTabHoverCards)},
|
||||
|
||||
@@ -72,7 +72,6 @@ extra/ungoogled-chromium/add-suggestions-url-field.patch
|
||||
extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
|
||||
extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
|
||||
extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
|
||||
extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch
|
||||
extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
|
||||
extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch
|
||||
extra/ungoogled-chromium/enable-menu-on-reload-button.patch
|
||||
|
||||
Reference in New Issue
Block a user