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()); |