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 chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc
index e0fa371f0a8a..7309acfc729d 100644
index 41a85d938028..0128b9f0d98b 100644
--- chrome/browser/renderer_preferences_util.cc
+++ chrome/browser/renderer_preferences_util.cc
@@ -32,7 +32,8 @@
@@ -31,7 +31,8 @@
#include "ui/base/cocoa/defaults_utils.h"
#endif
@ -12,7 +12,7 @@ index e0fa371f0a8a..7309acfc729d 100644
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h"
@@ -132,7 +133,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
@@ -130,7 +131,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
prefs->caret_blink_interval = interval;
#endif