Skip to content

Commit 11ecb03

Browse files
Ramya Nagarajanasvitkine-chromium
authored andcommitted
[Mac] Adds Emoji context menu icon in MacViews.
This change adds an emoji icon to be shown along with the menu text. https://screenshot.googleplex.com/LO3aKXYwaqc. For more details, see http://go/chrome-emojisertion. Bug: 827404 Change-Id: I2b480a7a60ca92ceeb042bdc347ebb5441fd71f7 Reviewed-on: https://chromium-review.googlesource.com/1010978 Reviewed-by: ccameron <ccameron@chromium.org> Commit-Queue: Ramya Nagarajan <ramyan@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#550507}(cherry picked from commit 5824f15) Reviewed-on: https://chromium-review.googlesource.com/1014203 Cr-Commit-Position: refs/branch-heads/3396@{#57} Cr-Branched-From: 9ef2aa8-refs/heads/master@{#550428}
1 parent 31940c3 commit 11ecb03

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

ui/views/controls/views_text_services_context_menu_mac.mm

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
#include "ui/base/cocoa/text_services_context_menu.h"
1111
#include "ui/base/l10n/l10n_util.h"
1212
#include "ui/base/models/simple_menu_model.h"
13+
#include "ui/base/resource/resource_bundle.h"
1314
#include "ui/base/ui_base_features.h"
1415
#include "ui/gfx/decorated_text.h"
1516
#import "ui/gfx/decorated_text_mac.h"
17+
#include "ui/resources/grit/ui_resources.h"
1618
#include "ui/strings/grit/ui_strings.h"
1719
#include "ui/views/controls/textfield/textfield.h"
1820
#include "ui/views/view.h"
@@ -42,8 +44,11 @@
4244
menu->InsertSeparatorAt(index++, ui::NORMAL_SEPARATOR);
4345
}
4446
if (base::FeatureList::IsEnabled(features::kEnableEmojiContextMenu)) {
45-
menu->InsertItemWithStringIdAt(index++, IDS_CONTENT_CONTEXT_EMOJI,
47+
menu->InsertItemWithStringIdAt(index, IDS_CONTENT_CONTEXT_EMOJI,
4648
IDS_CONTENT_CONTEXT_EMOJI);
49+
menu->SetIcon(index++,
50+
ui::ResourceBundle::GetSharedInstance().GetImageNamed(
51+
IDR_EMOJI_FAVICON));
4752
menu->InsertSeparatorAt(index++, ui::NORMAL_SEPARATOR);
4853
}
4954
text_services_menu_.AppendToContextMenu(menu);

0 commit comments

Comments
 (0)