Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
51 changed files
with
1,573 additions
and
210 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Jeremy Apthorp <nornagon@nornagon.net> | ||
Date: Mon, 10 Feb 2020 11:52:23 -0800 | ||
Subject: hack plugin response interceptor to point to electron | ||
|
||
chrome's streams_private_api does prerender and other things and would | ||
require a largeish patch to get working, so just redirect it to our | ||
implementation instead. | ||
|
||
diff --git a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc | ||
index 1c9aeb8fa71d054159c2ccccccbe57aa474d417e..0bd6412f2c79f77f936720b1a0795b50ecefd26c 100644 | ||
--- a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc | ||
+++ b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc | ||
@@ -8,8 +8,8 @@ | ||
#include "base/feature_list.h" | ||
#include "base/guid.h" | ||
#include "base/task/post_task.h" | ||
-#include "chrome/browser/extensions/api/streams_private/streams_private_api.h" | ||
-#include "chrome/browser/plugins/plugin_utils.h" | ||
+#include "electron/shell/browser/extensions/api/streams_private/streams_private_api.h" | ||
+#include "electron/shell/browser/plugins/plugin_utils.h" | ||
#include "content/public/browser/browser_task_traits.h" | ||
#include "content/public/browser/browser_thread.h" | ||
#include "content/public/browser/download_utils.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Jeremy Apthorp <nornagon@nornagon.net> | ||
Date: Mon, 10 Feb 2020 10:37:48 -0800 | ||
Subject: use electron resources in pdf_util | ||
|
||
Without this, the ID for IDR_PDF_MANIFEST will be wrong on linux | ||
and cause a DCHECK(), since the resource will be loaded as an empty | ||
string. | ||
|
||
diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc | ||
index 877d0ba2f48359243527ddebf1d91132b3d5c455..cd69de498c4968ade0ffabf45b72d4d63b70b10f 100644 | ||
--- a/chrome/browser/pdf/pdf_extension_util.cc | ||
+++ b/chrome/browser/pdf/pdf_extension_util.cc | ||
@@ -6,7 +6,7 @@ | ||
|
||
#include "base/strings/string_util.h" | ||
#include "chrome/common/chrome_content_client.h" | ||
-#include "chrome/grit/browser_resources.h" | ||
+#include "electron/grit/electron_resources.h" | ||
#include "ui/base/resource/resource_bundle.h" | ||
|
||
namespace pdf_extension_util { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.