Update to Chromium revision 614d31da (#423768)

- Fix PDF extension loading after showing the plugin placeholder (issue #2020)
This commit is contained in:
Marshall Greenblatt
2016-10-21 15:52:29 -04:00
parent 07d12b78e1
commit c9e81c082f
75 changed files with 725 additions and 502 deletions

View File

@@ -1,5 +1,5 @@
diff --git renderer_preferences_util.cc renderer_preferences_util.cc
index ad5e301..c64325b 100644
index aa4f1c2..cdf2fd9 100644
--- renderer_preferences_util.cc
+++ renderer_preferences_util.cc
@@ -30,7 +30,8 @@
@@ -12,7 +12,7 @@ index ad5e301..c64325b 100644
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h"
@@ -130,7 +131,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
@@ -132,7 +133,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
prefs->caret_blink_interval = interval.InSecondsF();
#endif