Update to Chromium version 77.0.3865.0 (#681094)

- Windows: SDK version 10.0.18362.0 is now required.
This commit is contained in:
Alexander Guettler
2019-09-04 15:13:32 +00:00
committed by Marshall Greenblatt
parent b6b033a52b
commit 46d3a81ba0
131 changed files with 1579 additions and 1332 deletions

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 6bd5bea7ddb0..076306275b5b 100644
index 50f7329cca40..c6cae9beda15 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/jumbo.gni")
@@ -10,7 +10,7 @@ index 6bd5bea7ddb0..076306275b5b 100644
import("//chrome/common/features.gni")
import("//chromeos/assistant/assistant.gni")
import("//components/feature_engagement/features.gni")
@@ -357,6 +358,10 @@ jumbo_split_static_library("ui") {
@@ -368,6 +369,10 @@ jumbo_split_static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@@ -21,7 +21,7 @@ index 6bd5bea7ddb0..076306275b5b 100644
# Since browser and browser_ui actually depend on each other,
# we must omit the dependency from browser_ui to browser.
# However, this means browser_ui and browser should more or less
@@ -374,6 +379,7 @@ jumbo_split_static_library("ui") {
@@ -385,6 +390,7 @@ jumbo_split_static_library("ui") {
"//base:i18n",
"//base/allocator:buildflags",
"//cc/paint",
@@ -30,17 +30,16 @@ index 6bd5bea7ddb0..076306275b5b 100644
"//chrome:resources",
"//chrome:strings",
diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc
index 1b9b3d857f47..85e2d1e5a5d5 100644
index c50cd8b8f779..31aa7a2a696b 100644
--- chrome/browser/ui/webui/net_export_ui.cc
+++ chrome/browser/ui/webui/net_export_ui.cc
@@ -20,14 +20,13 @@
@@ -20,13 +20,12 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
+#include "cef/libcef/features/features.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/io_thread.h"
#include "chrome/browser/net/net_export_helper.h"
#include "chrome/browser/net/system_network_context_manager.h"
#include "chrome/browser/platform_util.h"
@@ -49,7 +48,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
#include "chrome/common/channel_info.h"
#include "chrome/common/url_constants.h"
#include "components/grit/components_resources.h"
@@ -42,7 +41,14 @@
@@ -41,7 +40,14 @@
#include "content/public/browser/web_ui_message_handler.h"
#include "extensions/buildflags/buildflags.h"
#include "net/log/net_log_capture_mode.h"
@@ -64,7 +63,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
#if defined(OS_ANDROID)
#include "chrome/browser/android/intent_helper.h"
@@ -68,6 +74,7 @@ content::WebUIDataSource* CreateNetExportHTMLSource() {
@@ -67,6 +73,7 @@ content::WebUIDataSource* CreateNetExportHTMLSource() {
return source;
}
@@ -72,7 +71,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
void SetIfNotNull(base::DictionaryValue* dict,
const base::StringPiece& path,
std::unique_ptr<base::Value> in_value) {
@@ -75,6 +82,7 @@ void SetIfNotNull(base::DictionaryValue* dict,
@@ -74,6 +81,7 @@ void SetIfNotNull(base::DictionaryValue* dict,
dict->Set(path, std::move(in_value));
}
}
@@ -80,7 +79,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
// This class receives javascript messages from the renderer.
// Note that the WebUI infrastructure runs on the UI thread, therefore all of
@@ -82,7 +90,9 @@ void SetIfNotNull(base::DictionaryValue* dict,
@@ -81,7 +89,9 @@ void SetIfNotNull(base::DictionaryValue* dict,
class NetExportMessageHandler
: public WebUIMessageHandler,
public base::SupportsWeakPtr<NetExportMessageHandler>,
@@ -90,7 +89,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
public net_log::NetExportFileWriter::StateObserver {
public:
NetExportMessageHandler();
@@ -98,11 +108,13 @@ class NetExportMessageHandler
@@ -97,11 +107,13 @@ class NetExportMessageHandler
void OnSendNetLog(const base::ListValue* list);
void OnShowFile(const base::ListValue* list);
@@ -104,7 +103,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
// net_log::NetExportFileWriter::StateObserver implementation.
void OnNewState(const base::DictionaryValue& state) override;
@@ -132,9 +144,16 @@ class NetExportMessageHandler
@@ -131,9 +143,16 @@ class NetExportMessageHandler
// renderer.
void NotifyUIWithState(std::unique_ptr<base::DictionaryValue> state);
@@ -121,7 +120,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
// Cached pointer to SystemNetworkContextManager's NetExportFileWriter.
net_log::NetExportFileWriter* file_writer_;
@@ -150,7 +169,9 @@ class NetExportMessageHandler
@@ -149,7 +168,9 @@ class NetExportMessageHandler
net::NetLogCaptureMode capture_mode_;
uint64_t max_log_file_size_;
@@ -129,9 +128,9 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
+#endif
base::WeakPtrFactory<NetExportMessageHandler> weak_ptr_factory_;
base::WeakPtrFactory<NetExportMessageHandler> weak_ptr_factory_{this};
@@ -168,8 +189,10 @@ NetExportMessageHandler::NetExportMessageHandler()
@@ -166,8 +187,10 @@ NetExportMessageHandler::NetExportMessageHandler()
NetExportMessageHandler::~NetExportMessageHandler() {
// There may be a pending file dialog, it needs to be told that the user
// has gone away so that it doesn't try to call back.
@@ -142,7 +141,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
file_writer_->StopNetLog(nullptr);
}
@@ -232,6 +255,7 @@ void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) {
@@ -230,6 +253,7 @@ void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) {
if (UsingMobileUI()) {
StartNetLog(base::FilePath());
} else {
@@ -150,7 +149,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
base::FilePath initial_dir = last_save_dir.Pointer()->empty() ?
DownloadPrefs::FromBrowserContext(
web_ui()->GetWebContents()->GetBrowserContext())->DownloadPath() :
@@ -239,6 +263,9 @@ void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) {
@@ -237,6 +261,9 @@ void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) {
base::FilePath initial_path =
initial_dir.Append(FILE_PATH_LITERAL("chrome-net-export-log.json"));
ShowSelectFileDialog(initial_path);
@@ -160,7 +159,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
}
}
@@ -248,6 +275,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
@@ -246,6 +273,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
std::unique_ptr<base::DictionaryValue> ui_thread_polled_data(
new base::DictionaryValue());
@@ -168,7 +167,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
Profile* profile = Profile::FromWebUI(web_ui());
SetIfNotNull(ui_thread_polled_data.get(), "prerenderInfo",
chrome_browser_net::GetPrerenderInfo(profile));
@@ -257,6 +285,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
@@ -255,6 +283,7 @@ void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
SetIfNotNull(ui_thread_polled_data.get(), "serviceProviders",
chrome_browser_net::GetWindowsServiceProviders());
#endif
@@ -176,7 +175,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
file_writer_->StopNetLog(std::move(ui_thread_polled_data));
}
@@ -273,6 +302,7 @@ void NetExportMessageHandler::OnShowFile(const base::ListValue* list) {
@@ -271,6 +300,7 @@ void NetExportMessageHandler::OnShowFile(const base::ListValue* list) {
base::Bind(&NetExportMessageHandler::ShowFileInShell, AsWeakPtr()));
}
@@ -184,7 +183,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
void NetExportMessageHandler::FileSelected(const base::FilePath& path,
int index,
void* params) {
@@ -291,6 +321,7 @@ void NetExportMessageHandler::FileSelectionCanceled(void* params) {
@@ -289,6 +319,7 @@ void NetExportMessageHandler::FileSelectionCanceled(void* params) {
DCHECK(select_file_dialog_);
select_file_dialog_ = nullptr;
}
@@ -192,7 +191,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
void NetExportMessageHandler::OnNewState(const base::DictionaryValue& state) {
NotifyUIWithState(state.CreateDeepCopy());
@@ -355,6 +386,7 @@ void NetExportMessageHandler::NotifyUIWithState(
@@ -353,6 +384,7 @@ void NetExportMessageHandler::NotifyUIWithState(
*state);
}
@@ -200,7 +199,7 @@ index 1b9b3d857f47..85e2d1e5a5d5 100644
void NetExportMessageHandler::ShowSelectFileDialog(
const base::FilePath& default_path) {
// User may have clicked more than once before the save dialog appears.
@@ -373,6 +405,43 @@ void NetExportMessageHandler::ShowSelectFileDialog(
@@ -371,6 +403,43 @@ void NetExportMessageHandler::ShowSelectFileDialog(
ui::SelectFileDialog::SELECT_SAVEAS_FILE, base::string16(), default_path,
&file_type_info, 0, base::FilePath::StringType(), owning_window, nullptr);
}