third_party/google_input_tools/src/chrome/os/inputview/elements/content/emojikey.js - Issue 828063007: Uprev Google Input Tools.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/google_input_tools/src/chrome/os/inputview/elements/content/emojikey.js

Issue 828063007: Uprev Google Input Tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update extensions schema. Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/google_input_tools/src/chrome/os/inputview/elements/content/compactkeymodel.js ('k') | third_party/google_input_tools/src/chrome/os/inputview/elements/content/emojiview.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/google_input_tools/src/chrome/os/inputview/elements/content/emojikey.js

diff --git a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/emojikey.js b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/emojikey.js

index 17cab0790b2587524fbdafc4d9314a16ca251812..be2f52b842a0485a5a453bb2c6b84fd34706b3e8 100644

--- a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/emojikey.js

+++ b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/emojikey.js

@@ -90,6 +90,9 @@ EmojiKey.prototype.createDom = function() {

* @return {string} .

EmojiKey.prototype.getLocalizedName = function() {

+ if (this.isEmoticon) {

+ return chrome.i18n.getMessage('smiley');

+ }

var lead = this.text.charCodeAt(0);

if (!lead) {

return '';