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

@@ -56,7 +56,7 @@ index 696a941..ce5abcd 100644
// The time is used for simulating menu behavior for the menu button; that
// is, if the menu is shown and the button is pressed, we need to close the
diff --git view.h view.h
index 55cc02b..c402f55 100644
index 28171db..747930c 100644
--- view.h
+++ view.h
@@ -18,6 +18,7 @@
@@ -67,7 +67,7 @@ index 55cc02b..c402f55 100644
#include "build/build_config.h"
#include "ui/accessibility/ax_enums.h"
#include "ui/base/accelerators/accelerator.h"
@@ -112,7 +113,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
@@ -113,7 +114,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
public ui::LayerOwner,
public ui::AcceleratorTarget,
public ui::EventTarget,