Update to Chromium revision 2b3ae3b8 (#394939)

This commit is contained in:
Marshall Greenblatt
2016-05-24 19:35:43 -04:00
parent 582ce074aa
commit ab2636b012
125 changed files with 619 additions and 626 deletions

View File

@ -1,8 +1,8 @@
diff --git renderer_preferences_util.cc renderer_preferences_util.cc
index 2fff3f3..86c7f0c 100644
index 1a1a910..94fe66a 100644
--- renderer_preferences_util.cc
+++ renderer_preferences_util.cc
@@ -27,7 +27,8 @@
@@ -22,7 +22,8 @@
#include "ui/views/controls/textfield/textfield.h"
#endif
@ -12,7 +12,7 @@ index 2fff3f3..86c7f0c 100644
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h"
@@ -95,7 +96,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
@@ -72,7 +73,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
#endif