Uprev Google Input Tools.

third_party/google_input_tools/src/chrome/os/inputview/config/material/emoji_data.js

Index: third_party/google_input_tools/src/chrome/os/inputview/config/material/emoji_data.js
diff --git a/third_party/google_input_tools/src/chrome/os/inputview/config/emoji_data.js b/third_party/google_input_tools/src/chrome/os/inputview/config/material/emoji_data.js
similarity index 97%
copy from third_party/google_input_tools/src/chrome/os/inputview/config/emoji_data.js
copy to third_party/google_input_tools/src/chrome/os/inputview/config/material/emoji_data.js
index ddc8e6b5bafc8dc03f3c865eb7c9debbbb50b9fe..a0b6da85573ea63373aa5ac014e48736171d1525 100644
--- a/third_party/google_input_tools/src/chrome/os/inputview/config/emoji_data.js
+++ b/third_party/google_input_tools/src/chrome/os/inputview/config/material/emoji_data.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.
@@ -474,7 +474,6 @@ goog.require('i18n.input.chrome.inputview.elements.ElementType');
       Css.EMOJI_TABBAR_SPECIAL_CHARACTERS));
   keyList.push(util.createTabBarKey('Tabbar7', EmojiType.EMOTICON,
       Css.EMOJI_TABBAR_EMOTICON));
-  keyList.push(util.createBackKey());
 
   var amount = 0;
   var acturalLength = 0;
@@ -515,10 +514,6 @@ goog.require('i18n.input.chrome.inputview.elements.ElementType');
     mapping[key['spec'][SpecNodeName.ID]] = viewIdPrefix + i;
   }
 
-  // Map the back key.
-  key = keyList[keyCharacters.length];
-  mapping[key['spec'][SpecNodeName.ID]] = viewIdPrefix + tabbarLength;
-
   // Map the emoji keys.
   amount = 0;
   var offset = tabbarLength + 1;
@@ -526,7 +521,7 @@ goog.require('i18n.input.chrome.inputview.elements.ElementType');
     acturalLength = Math.ceil(keyCharacters[i].length / emojiKeyAmount) *
         emojiKeyAmount;
     for (var j = 0, lenJ = acturalLength; j < lenJ; j++) {
-      key = keyList[amount + tabbarLength];
+      key = keyList[amount + len];
       mapping[key['spec'][SpecNodeName.ID]] = viewIdPrefix + (amount +
           offset);
       amount++;
@@ -535,11 +530,23 @@ goog.require('i18n.input.chrome.inputview.elements.ElementType');
 
   // Map the side keys
   for (var i = 0; i < 3; ++i) {
-    key = keyList[i + amount + tabbarLength];
+    key = keyList[i + amount + keyCharacters.length];
     mapping[key['spec'][SpecNodeName.ID]] = viewIdPrefix +
         (i + amount + offset);
   }
 
+  amount = amount + offset + 3;
+  //The space row.
+  var tmp = util.createBackToKeyboardKey();
+  keyList.push(tmp);
+  mapping[tmp['spec'][SpecNodeName.ID]] = viewIdPrefix + amount++;
+  tmp = util.createSpaceKey();
+  keyList.push(tmp);
+  mapping[tmp['spec'][SpecNodeName.ID]] = viewIdPrefix + amount++;
+  tmp = util.createHideKeyboardKey();
+  keyList.push(tmp);
+  mapping[tmp['spec'][SpecNodeName.ID]] = viewIdPrefix + amount++;
+
   var result = [];
   result[SpecNodeName.TEXT] = keyCharacters;
   result[SpecNodeName.KEY_LIST] = keyList;