Update to Chromium version 69.0.3497.32

This commit is contained in:
Marshall Greenblatt
2018-08-15 17:01:54 -04:00
parent 17f0192053
commit 7ed3a545e9
14 changed files with 57 additions and 56 deletions

View File

@ -1,8 +1,8 @@
diff --git base/message_loop/message_loop.cc base/message_loop/message_loop.cc
index 4571c726ec4a..ad1479647400 100644
index 3723960a5c0c..fa924f020f4e 100644
--- base/message_loop/message_loop.cc
+++ base/message_loop/message_loop.cc
@@ -573,6 +573,9 @@ MessageLoopForUI::MessageLoopForUI(Type type) : MessageLoop(type) {
@@ -577,6 +577,9 @@ MessageLoopForUI::MessageLoopForUI(Type type) : MessageLoop(type) {
#endif
}
@ -13,10 +13,10 @@ index 4571c726ec4a..ad1479647400 100644
MessageLoopCurrentForUI MessageLoopForUI::current() {
return MessageLoopCurrentForUI::Get();
diff --git base/message_loop/message_loop.h base/message_loop/message_loop.h
index 6010333616eb..f9479daaa4b8 100644
index 7c31a128b53d..8d9dfdbc2a68 100644
--- base/message_loop/message_loop.h
+++ base/message_loop/message_loop.h
@@ -343,6 +343,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate,
@@ -351,6 +351,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate,
class BASE_EXPORT MessageLoopForUI : public MessageLoop {
public:
explicit MessageLoopForUI(Type type = TYPE_UI);