mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 59.0.3071.82
This commit is contained in:
@@ -243,7 +243,7 @@ index 3f9436d..0bf813a1 100644
|
||||
SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
|
||||
else if (item->GetParentMenuItem()->GetParentMenuItem())
|
||||
diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
|
||||
index db99e54..7c67a04 100644
|
||||
index db99e54..49c281a 100644
|
||||
--- ui/views/controls/menu/menu_delegate.h
|
||||
+++ ui/views/controls/menu/menu_delegate.h
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -254,11 +254,10 @@ index db99e54..7c67a04 100644
|
||||
#include "ui/base/dragdrop/drag_drop_types.h"
|
||||
#include "ui/base/dragdrop/os_exchange_data.h"
|
||||
#include "ui/base/ui_base_types.h"
|
||||
@@ -75,6 +76,22 @@ class VIEWS_EXPORT MenuDelegate {
|
||||
// Whether this item should be displayed with the normal text color, even if
|
||||
@@ -76,6 +77,22 @@ class VIEWS_EXPORT MenuDelegate {
|
||||
// it's disabled.
|
||||
virtual bool GetShouldUseNormalForegroundColor(int command_id) const;
|
||||
+
|
||||
|
||||
+ // Override the text color of a given menu item dependent on the |command_id|
|
||||
+ // and its |is_hovered| state. |is_minor| will be true for accelerator text.
|
||||
+ // Returns true if it chooses to override the color.
|
||||
@@ -274,9 +273,10 @@ index db99e54..7c67a04 100644
|
||||
+ bool is_hovered,
|
||||
+ SkColor* override_color) const
|
||||
+ { return false; }
|
||||
|
||||
+
|
||||
// The tooltip shown for the menu item. This is invoked when the user
|
||||
// hovers over the item, and no tooltip text has been set for that item.
|
||||
virtual base::string16 GetTooltipText(int id,
|
||||
@@ -208,6 +225,11 @@ class VIEWS_EXPORT MenuDelegate {
|
||||
bool* has_mnemonics,
|
||||
MenuButton** button);
|
||||
|
Reference in New Issue
Block a user