Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

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

Issue 1046933003: Updates google-input-tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
Index: third_party/google_input_tools/src/chrome/os/inputview/elements/content/enterkey.js
diff --git a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/menukey.js b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/enterkey.js
similarity index 58%
copy from third_party/google_input_tools/src/chrome/os/inputview/elements/content/menukey.js
copy to third_party/google_input_tools/src/chrome/os/inputview/elements/content/enterkey.js
index 39d7484c1b3d95ddbe6ba064acc6c33b1821b96c..5ac654682bdf0fc9ebb34c8623c4642d5a2999c4 100644
--- a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/menukey.js
+++ b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/enterkey.js
@@ -1,4 +1,4 @@
-// Copyright 2014 The ChromeOS IME Authors. All Rights Reserved.
+// Copyright 2015 The ChromeOS IME Authors. All Rights Reserved.
// limitations under the License.
// See the License for the specific language governing permissions and
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -11,42 +11,39 @@
// you may not use this file except in compliance with the License.
// Licensed under the Apache License, Version 2.0 (the "License");
//
-goog.provide('i18n.input.chrome.inputview.elements.content.MenuKey');
+goog.provide('i18n.input.chrome.inputview.elements.content.EnterKey');
goog.require('i18n.input.chrome.inputview.elements.content.FunctionalKey');
goog.scope(function() {
+var ElementType = i18n.input.chrome.inputview.elements.ElementType;
/**
- * The three dots menu key.
+ * The enter key.
*
* @param {string} id The id.
- * @param {!i18n.input.chrome.inputview.elements.ElementType} type The element
- * type.
- * @param {string} text The text.
* @param {string} iconCssClass The css class for the icon.
- * @param {string} toKeyset The keyset id.
* @param {goog.events.EventTarget=} opt_eventTarget The event target.
* @constructor
* @extends {i18n.input.chrome.inputview.elements.content.FunctionalKey}
*/
-i18n.input.chrome.inputview.elements.content.MenuKey = function(id, type,
- text, iconCssClass, toKeyset, opt_eventTarget) {
- goog.base(this, id, type, text, iconCssClass, opt_eventTarget);
-
- /**
- * The id of the key set to go after this switcher key in menu is pressed.
- *
- * @type {string}
- */
- this.toKeyset = toKeyset;
-
+i18n.input.chrome.inputview.elements.content.EnterKey = function(id,
+ iconCssClass, opt_eventTarget) {
+ goog.base(this, id, ElementType.ENTER_KEY, '', iconCssClass,
+ opt_eventTarget);
};
-goog.inherits(i18n.input.chrome.inputview.elements.content.MenuKey,
+goog.inherits(i18n.input.chrome.inputview.elements.content.EnterKey,
i18n.input.chrome.inputview.elements.content.FunctionalKey);
+var EnterKey = i18n.input.chrome.inputview.elements.content.EnterKey;
+/** @override */
+EnterKey.prototype.createDom = function() {
+ goog.base(this, 'createDom');
+
+ this.disableBackgroundHighlight();
+};
}); // goog.scope

Powered by Google App Engine
This is Rietveld 408576698