mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 939b32ee (#454471)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git controls/button/menu_button.cc controls/button/menu_button.cc
|
||||
index c4e986b..02fb9f3 100644
|
||||
index 173194b..8bb4f6e 100644
|
||||
--- controls/button/menu_button.cc
|
||||
+++ controls/button/menu_button.cc
|
||||
@@ -193,7 +193,7 @@ void MenuButton::OnPaint(gfx::Canvas* canvas) {
|
||||
@@ -32,7 +32,7 @@ index c4e986b..02fb9f3 100644
|
||||
+
|
||||
} // namespace views
|
||||
diff --git controls/button/menu_button.h controls/button/menu_button.h
|
||||
index c232cc1..cc207f9 100644
|
||||
index b0ddf331..4d573ed 100644
|
||||
--- controls/button/menu_button.h
|
||||
+++ controls/button/menu_button.h
|
||||
@@ -54,6 +54,9 @@ class VIEWS_EXPORT MenuButton : public LabelButton {
|
||||
@@ -56,7 +56,7 @@ index c232cc1..cc207f9 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 147785c..5d413a1 100644
|
||||
index fcbee85..8ba4fd0 100644
|
||||
--- view.h
|
||||
+++ view.h
|
||||
@@ -18,6 +18,7 @@
|
||||
@@ -75,5 +75,5 @@ index 147785c..5d413a1 100644
|
||||
+ public ui::EventHandler,
|
||||
+ public base::SupportsUserData {
|
||||
public:
|
||||
typedef std::vector<View*> Views;
|
||||
using Views = std::vector<View*>;
|
||||
|
||||
|
Reference in New Issue
Block a user