2020-05-26 20:06:26 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
|
|
Date: Thu, 21 May 2020 13:58:01 -0700
|
|
|
|
Subject: Allow setting secondary label via SimpleMenuModel
|
|
|
|
|
|
|
|
Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976
|
|
|
|
|
|
|
|
diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
|
2020-07-14 01:13:34 +00:00
|
|
|
index 1fc029cb37562dc32a961666c3af3b0c27b04e5a..e1c6fe2ea2c3c89e10ff4ae27d16baf053e8a3a0 100644
|
2020-05-26 20:06:26 +00:00
|
|
|
--- a/ui/base/models/simple_menu_model.cc
|
|
|
|
+++ b/ui/base/models/simple_menu_model.cc
|
|
|
|
@@ -49,6 +49,11 @@ base::string16 SimpleMenuModel::Delegate::GetLabelForCommandId(
|
|
|
|
return base::string16();
|
|
|
|
}
|
|
|
|
|
|
|
|
+base::string16 SimpleMenuModel::Delegate::GetSecondaryLabelForCommandId(
|
|
|
|
+ int command_id) const {
|
|
|
|
+ return base::string16();
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
ImageModel SimpleMenuModel::Delegate::GetIconForCommandId(
|
|
|
|
int command_id) const {
|
|
|
|
return ImageModel();
|
|
|
|
@@ -291,6 +296,11 @@ void SimpleMenuModel::SetLabel(int index, const base::string16& label) {
|
|
|
|
MenuItemsChanged();
|
|
|
|
}
|
|
|
|
|
|
|
|
+void SimpleMenuModel::SetSecondaryLabel(int index, const base::string16& secondary_label) {
|
|
|
|
+ items_[ValidateItemIndex(index)].secondary_label = secondary_label;
|
|
|
|
+ MenuItemsChanged();
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
void SimpleMenuModel::SetMinorText(int index,
|
|
|
|
const base::string16& minor_text) {
|
|
|
|
items_[ValidateItemIndex(index)].minor_text = minor_text;
|
2020-07-14 01:13:34 +00:00
|
|
|
@@ -368,6 +378,12 @@ base::string16 SimpleMenuModel::GetLabelAt(int index) const {
|
2020-05-26 20:06:26 +00:00
|
|
|
return items_[ValidateItemIndex(index)].label;
|
|
|
|
}
|
|
|
|
|
|
|
|
+base::string16 SimpleMenuModel::GetSecondaryLabelAt(int index) const {
|
|
|
|
+ if (IsItemDynamicAt(index))
|
|
|
|
+ return delegate_->GetSecondaryLabelForCommandId(GetCommandIdAt(index));
|
|
|
|
+ return items_[ValidateItemIndex(index)].secondary_label;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
base::string16 SimpleMenuModel::GetMinorTextAt(int index) const {
|
|
|
|
return items_[ValidateItemIndex(index)].minor_text;
|
|
|
|
}
|
|
|
|
diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
|
2020-07-14 01:13:34 +00:00
|
|
|
index 3067f9beba9e79e18d341aea052d82aad34039d0..ffd8d7c53378b490e54af430371dc8a44121f72b 100644
|
2020-05-26 20:06:26 +00:00
|
|
|
--- a/ui/base/models/simple_menu_model.h
|
|
|
|
+++ b/ui/base/models/simple_menu_model.h
|
|
|
|
@@ -44,6 +44,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
|
|
|
|
// Some command ids have labels and icons that change over time.
|
|
|
|
virtual bool IsItemForCommandIdDynamic(int command_id) const;
|
|
|
|
virtual base::string16 GetLabelForCommandId(int command_id) const;
|
|
|
|
+ virtual base::string16 GetSecondaryLabelForCommandId(int command_id) const;
|
|
|
|
// Gets the icon for the item with the specified id.
|
|
|
|
virtual ImageModel GetIconForCommandId(int command_id) const;
|
|
|
|
|
|
|
|
@@ -147,6 +148,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
|
|
|
|
// Sets the label for the item at |index|.
|
|
|
|
void SetLabel(int index, const base::string16& label);
|
|
|
|
|
|
|
|
+ // Sets the secondary_label for the item at |index|.
|
|
|
|
+ void SetSecondaryLabel(int index, const base::string16& secondary_label);
|
|
|
|
+
|
|
|
|
// Sets the minor text for the item at |index|.
|
|
|
|
void SetMinorText(int index, const base::string16& minor_text);
|
|
|
|
|
2020-07-14 01:13:34 +00:00
|
|
|
@@ -176,6 +180,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
|
2020-05-26 20:06:26 +00:00
|
|
|
ui::MenuSeparatorType GetSeparatorTypeAt(int index) const override;
|
|
|
|
int GetCommandIdAt(int index) const override;
|
|
|
|
base::string16 GetLabelAt(int index) const override;
|
|
|
|
+ base::string16 GetSecondaryLabelAt(int index) const override;
|
|
|
|
base::string16 GetMinorTextAt(int index) const override;
|
|
|
|
ImageModel GetMinorIconAt(int index) const override;
|
|
|
|
bool IsItemDynamicAt(int index) const override;
|
2020-07-14 01:13:34 +00:00
|
|
|
@@ -211,6 +216,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
|
2020-05-26 20:06:26 +00:00
|
|
|
int command_id = 0;
|
|
|
|
ItemType type = TYPE_COMMAND;
|
|
|
|
base::string16 label;
|
|
|
|
+ base::string16 secondary_label;
|
|
|
|
base::string16 minor_text;
|
|
|
|
ImageModel minor_icon;
|
|
|
|
ImageModel icon;
|