* chore: bump chromium in DEPS to 139.0.7242.0 * chore: update render_widget_host_view_mac.patch no code changes; just updating patch context Do a cleanup pass on the history swiper code | https://chromium-review.googlesource.com/c/chromium/src/+/6604367 * chore: update mas_avoid_private_macos_api_usage.patch.patch no code changes; just updating patch context [tracing] Delete base/trace_event/base_tracing.h | https://chromium-review.googlesource.com/c/chromium/src/+/6624012 * chore: update chore_provide_iswebcontentscreationoverridden_with_full_params.patch no manual changes; just updating patch context [ActorFramework] Refactor Actor Task Management | https://chromium-review.googlesource.com/c/chromium/src/+/6618684 * chore: update fix_move_autopipsettingshelper_behind_branding_buildflag.patch [pip] Tuck picture-in-picture windows when a file dialog is open | https://chromium-review.googlesource.com/c/chromium/src/+/6449682 Reland "[document pip] Restrict the size that a website can request" | https://chromium-review.googlesource.com/c/chromium/src/+/6372104 * chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch Xref: corner-shape: constraint radii based on opposite corner overlap | https://chromium-review.googlesource.com/c/chromium/src/+/6592572 * chore: update revert_code_health_clean_up_stale_macwebcontentsocclusion.patch no manual changes; just updating patch context * chore: update fix_rename_sqlite_win32_exports_to_avoid_conflicts_with_node_js.patch no code changes; just updating patch context * chore: e patches all * Plumb Verify2QwacBinding and hook it up in QwacWebContentsObserver https://chromium-review.googlesource.com/c/chromium/src/+/6624719 * [Extensions] Remove host delegate OnMainFrameCreatedForBackgroundPage https://chromium-review.googlesource.com/c/chromium/src/+/6631123 * Extensions: Rename GetResourceURL to ResolveExtensionURL https://chromium-review.googlesource.com/c/chromium/src/+/6625053 * [NonClientFrameView] Consolidate NativeFrameViewMac https://chromium-review.googlesource.com/c/chromium/src/+/6614239 * ICWYU * [views-ax] Remove dead code WidgetAXTreeIDMap https://chromium-review.googlesource.com/c/chromium/src/+/6619701 * Reland "extensions: Add `WillPrepareForEvaluation` to setup MojoJS" https://chromium-review.googlesource.com/c/chromium/src/+/6630056 * NavigationThrottleRunner2: Remove MaybeAddThrottle https://chromium-review.googlesource.com/c/chromium/src/+/6628079 * [pip] Tuck picture-in-picture windows when a file dialog is open https://chromium-review.googlesource.com/c/chromium/src/+/6449682 * build: fix snapshot_blob.bin build error xref: https://issues.chromium.org/issues/416540976 * chore: e patches all * build: freeup disk space on macos * chore: bump chromium in DEPS to 139.0.7244.0 * chore: update printing.patch no manual changes; just updating patch context * chore: remove upstreamed ignore_parse_errors_for_resolveshortcutproperties.patch Prevent Windows crash on unexpected shortcut type | https://chromium-review.googlesource.com/c/chromium/src/+/6633298 * chore: e patches all * Revert "Reland "extensions: Add `WillPrepareForEvaluation` to setup MojoJS"" This reverts commit 77c4f967a637f7e8970114f91311f9fddede0f7c. Revert CL for the high confidence crash culprit for http://crash/28f897bb9743dfe0 | https://chromium-review.googlesource.com/c/chromium/src/+/6641819 * Fix spec's expected base64-encoded PNG strings to match upstream changes. [rust png] Enable by default. | https://chromium-review.googlesource.com/c/chromium/src/+/6085801 * chore: bump chromium in DEPS to 139.0.7246.0 * chore: e patches all * chore: bump chromium in DEPS to 139.0.7248.0 * chore: update patches * siso: Enable Siso by default for non-Google builds https://chromium-review.googlesource.com/c/chromium/src/+/6638830 Disabling for now until we are ready to build siso on all platforms. * Revert "revert Don't use static variable for UseExternalPopupMenus" This reverts commit e91e3894e6c34cc0ffe69ed45417c0ebec882fb1. * Update mac_sdk_min to match minimum required SDK version https://chromium-review.googlesource.com/c/chromium/src/+/6493969 (cherry picked from commit 3e7cbe912d8fe1062d68ed06968aaee22013985f) * [video pip] Use default window styling on Mac https://chromium-review.googlesource.com/c/chromium/src/+/6648665 * Reland "Force the unintentional renderer process creation check by default" https://chromium-review.googlesource.com/c/chromium/src/+/6626905 * fixup: Reland "Force the unintentional renderer process creation check by default https://chromium-review.googlesource.com/c/chromium/src/+/6626905 * chore: bump chromium in DEPS to 139.0.7249.0 * fixup: Reland "Force the unintentional renderer process creation check by default https://chromium-review.googlesource.com/c/chromium/src/+/6626905 * chore: update patches * chore: bump chromium in DEPS to 139.0.7250.0 * chore: bump chromium in DEPS to 139.0.7252.0 * chore: bump chromium in DEPS to 139.0.7254.0 * 6638187: browser level TOCTOU check for coordinate target https://chromium-review.googlesource.com/c/chromium/src/+/6638187 * chore: fixup patch indices * chore: add missing base/notimplemented includes * 6652910: [Frame Cleanup] Push down/hide implementation-specific API https://chromium-review.googlesource.com/c/chromium/src/+/6652910 * chore: bump chromium in DEPS to 139.0.7256.0 * chore: fix lint * fixup! 6652910: [Frame Cleanup] Push down/hide implementation-specific API * fix: move HandleScope location * chore: bump chromium in DEPS to 139.0.7258.0 * fixup! [NonClientFrameView] Consolidate NativeFrameViewMac * Revert "chore: bump chromium in DEPS to 139.0.7258.0" This reverts commit 264b2e934f4b2705c47d9761010052b95d9dd5de. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
		
			
				
	
	
		
			86 lines
		
	
	
	
		
			3.8 KiB
			
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			86 lines
		
	
	
	
		
			3.8 KiB
			
		
	
	
	
		
			Diff
		
	
	
	
	
	
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/menus/simple_menu_model.cc b/ui/menus/simple_menu_model.cc
 | 
						|
index 1e43ac04035446ea68a6aa3b1b252f8bc9e22099..cdf45574fde7459019ecd57ad14b8fec5e04c8af 100644
 | 
						|
--- a/ui/menus/simple_menu_model.cc
 | 
						|
+++ b/ui/menus/simple_menu_model.cc
 | 
						|
@@ -55,6 +55,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId(
 | 
						|
   return std::u16string();
 | 
						|
 }
 | 
						|
 
 | 
						|
+std::u16string SimpleMenuModel::Delegate::GetSecondaryLabelForCommandId(
 | 
						|
+    int command_id) const {
 | 
						|
+  return std::u16string();
 | 
						|
+}
 | 
						|
+
 | 
						|
 ImageModel SimpleMenuModel::Delegate::GetIconForCommandId(
 | 
						|
     int command_id) const {
 | 
						|
   return ImageModel();
 | 
						|
@@ -348,6 +353,11 @@ void SimpleMenuModel::SetAcceleratorAt(size_t index,
 | 
						|
   MenuItemsChanged();
 | 
						|
 }
 | 
						|
 
 | 
						|
+void SimpleMenuModel::SetSecondaryLabel(size_t index, const std::u16string& secondary_label) {
 | 
						|
+  items_[ValidateItemIndex(index)].secondary_label = secondary_label;
 | 
						|
+  MenuItemsChanged();
 | 
						|
+}
 | 
						|
+
 | 
						|
 void SimpleMenuModel::SetMinorText(size_t index,
 | 
						|
                                    const std::u16string& minor_text) {
 | 
						|
   items_[ValidateItemIndex(index)].minor_text = minor_text;
 | 
						|
@@ -454,6 +464,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const {
 | 
						|
   return items_[ValidateItemIndex(index)].label;
 | 
						|
 }
 | 
						|
 
 | 
						|
+std::u16string SimpleMenuModel::GetSecondaryLabelAt(size_t index) const {
 | 
						|
+  if (IsItemDynamicAt(index))
 | 
						|
+    return delegate_->GetSecondaryLabelForCommandId(GetCommandIdAt(index));
 | 
						|
+  return items_[ValidateItemIndex(index)].secondary_label;
 | 
						|
+}
 | 
						|
+
 | 
						|
 std::u16string SimpleMenuModel::GetMinorTextAt(size_t index) const {
 | 
						|
   return items_[ValidateItemIndex(index)].minor_text;
 | 
						|
 }
 | 
						|
diff --git a/ui/menus/simple_menu_model.h b/ui/menus/simple_menu_model.h
 | 
						|
index 596663d62632e4331f8aad421298d1fcdc9ab05e..469778f0c13e6d3fd30023af9b19c4a4cb7969be 100644
 | 
						|
--- a/ui/menus/simple_menu_model.h
 | 
						|
+++ b/ui/menus/simple_menu_model.h
 | 
						|
@@ -99,6 +99,7 @@ class COMPONENT_EXPORT(UI_MENUS) SimpleMenuModel : public MenuModel {
 | 
						|
     // Some command ids have labels and icons that change over time.
 | 
						|
     virtual bool IsItemForCommandIdDynamic(int command_id) const;
 | 
						|
     virtual std::u16string GetLabelForCommandId(int command_id) const;
 | 
						|
+    virtual std::u16string GetSecondaryLabelForCommandId(int command_id) const;
 | 
						|
     // Gets the icon for the item with the specified id.
 | 
						|
     virtual ImageModel GetIconForCommandId(int command_id) const;
 | 
						|
 
 | 
						|
@@ -224,6 +225,9 @@ class COMPONENT_EXPORT(UI_MENUS) SimpleMenuModel : public MenuModel {
 | 
						|
   // former is set).
 | 
						|
   void SetAcceleratorAt(size_t index, const ui::Accelerator& accelerator);
 | 
						|
 
 | 
						|
+  // Sets the secondary_label for the item at |index|.
 | 
						|
+  void SetSecondaryLabel(size_t index, const std::u16string& secondary_label);
 | 
						|
+
 | 
						|
   // Sets the minor text for the item at |index|.
 | 
						|
   void SetMinorText(size_t index, const std::u16string& minor_text);
 | 
						|
 
 | 
						|
@@ -274,6 +278,7 @@ class COMPONENT_EXPORT(UI_MENUS) SimpleMenuModel : public MenuModel {
 | 
						|
   ui::MenuSeparatorType GetSeparatorTypeAt(size_t index) const override;
 | 
						|
   int GetCommandIdAt(size_t index) const override;
 | 
						|
   std::u16string GetLabelAt(size_t index) const override;
 | 
						|
+  std::u16string GetSecondaryLabelAt(size_t index) const override;
 | 
						|
   std::u16string GetMinorTextAt(size_t index) const override;
 | 
						|
   ImageModel GetMinorIconAt(size_t index) const override;
 | 
						|
   bool IsItemDynamicAt(size_t index) const override;
 | 
						|
@@ -321,6 +326,7 @@ class COMPONENT_EXPORT(UI_MENUS) SimpleMenuModel : public MenuModel {
 | 
						|
     ItemType type = TYPE_COMMAND;
 | 
						|
     std::u16string label;
 | 
						|
     ui::Accelerator accelerator;
 | 
						|
+    std::u16string secondary_label;
 | 
						|
     std::u16string minor_text;
 | 
						|
     ImageModel minor_icon;
 | 
						|
     ImageModel icon;
 |