Update to Chromium version 68.0.3440.0 (#561733)

This commit is contained in:
Marshall Greenblatt
2018-06-01 15:16:26 -04:00
parent 21310e4374
commit f6f2c9a0ca
51 changed files with 337 additions and 375 deletions

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc
index ef6eeb91a9e5..72e5fbcc1883 100644
index e0fa371f0a8a..7309acfc729d 100644
--- chrome/browser/renderer_preferences_util.cc
+++ chrome/browser/renderer_preferences_util.cc
@@ -32,7 +32,8 @@
@@ -12,7 +12,7 @@ index ef6eeb91a9e5..72e5fbcc1883 100644
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h"
@@ -136,7 +137,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
@@ -132,7 +133,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
prefs->caret_blink_interval = interval;
#endif