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

Unified Diff: third_party/google_input_tools/src/chrome/os/inputview/keyboardcontainer.js

Issue 701603002: Update to google-input-tools version 1.0.5.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/keyboardcontainer.js
diff --git a/third_party/google_input_tools/src/chrome/os/inputview/keyboardcontainer.js b/third_party/google_input_tools/src/chrome/os/inputview/keyboardcontainer.js
index 824af55b892c754c6d41e8cda307b9ed5057c15c..726131af42cdd68d1810d3cd45f1c2c1d2b9c3a7 100644
--- a/third_party/google_input_tools/src/chrome/os/inputview/keyboardcontainer.js
+++ b/third_party/google_input_tools/src/chrome/os/inputview/keyboardcontainer.js
@@ -103,15 +103,6 @@ KeyboardContainer.HANDWRITING_PADDING_ = 22;
/**
- * The padding of emoji keyset.
- *
- * @type {number}
- * @private
- */
-KeyboardContainer.EMOJI_PADDING_ = 22;
-
-
-/**
* An div to wrapper candidate view and keyboard set view.
*
* @private {Element}
@@ -260,8 +251,10 @@ KeyboardContainer.prototype.resize = function(width, height, widthPercent,
elem.style.paddingLeft = elem.style.paddingRight = padding + 'px';
var w = width - 2 * padding;
- h = this.currentKeysetView.disableCandidateView ?
- h - KeyboardContainer.EMOJI_PADDING_ : h - candidateViewHeight;
+
+ // Reduce height if candidate view is enabled
+ h = this.currentKeysetView.disableCandidateView ? h :
+ h - candidateViewHeight;
this.candidateView.setWidthInWeight(
this.currentKeysetView.getWidthInWeight());

Powered by Google App Engine
This is Rietveld 408576698