Update to Chromium version 69.0.3497.0 (#576753)

This commit is contained in:
Marshall Greenblatt
2018-07-23 18:32:02 -04:00
parent fad6aec5d0
commit 7d09642925
54 changed files with 346 additions and 311 deletions

View File

@ -1,8 +1,8 @@
diff --git base/message_loop/message_loop.cc base/message_loop/message_loop.cc
index 3c715c8e6ae9..d1622d2e87c9 100644
index 4571c726ec4a..ad1479647400 100644
--- base/message_loop/message_loop.cc
+++ base/message_loop/message_loop.cc
@@ -701,6 +701,9 @@ MessageLoopForUI::MessageLoopForUI(Type type) : MessageLoop(type) {
@@ -573,6 +573,9 @@ MessageLoopForUI::MessageLoopForUI(Type type) : MessageLoop(type) {
#endif
}
@ -13,10 +13,10 @@ index 3c715c8e6ae9..d1622d2e87c9 100644
MessageLoopCurrentForUI MessageLoopForUI::current() {
return MessageLoopCurrentForUI::Get();
diff --git base/message_loop/message_loop.h base/message_loop/message_loop.h
index f34416015fee..9727efbe288f 100644
index 6010333616eb..f9479daaa4b8 100644
--- base/message_loop/message_loop.h
+++ base/message_loop/message_loop.h
@@ -352,6 +352,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate,
@@ -343,6 +343,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate,
class BASE_EXPORT MessageLoopForUI : public MessageLoop {
public:
explicit MessageLoopForUI(Type type = TYPE_UI);
@ -60,7 +60,7 @@ index 61d1607e31e7..656b3a9c9f68 100644
#if !defined(OS_NACL)
diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
index 8dad64cbeb3a..63fa0e1a2be7 100644
index c95f85abfee1..b28ac0a0faa1 100644
--- base/message_loop/message_pump_win.cc
+++ base/message_loop/message_pump_win.cc
@@ -11,6 +11,7 @@
@ -71,7 +71,7 @@ index 8dad64cbeb3a..63fa0e1a2be7 100644
#include "base/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event.h"
@@ -381,20 +382,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
@@ -375,20 +376,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
}
bool MessagePumpForUI::ProcessPumpReplacementMessage() {