Uprev Google Input Tools.

BUG=450050 Review URL: https://codereview.chromium.org/828063007 Cr-Commit-Position: refs/heads/master@{#313667}
Denger-Network · Jan 29, 2015 · 8a72e65 · 8a72e65
1 parent 9cc2224
commit 8a72e65
Show file tree

Hide file tree

Showing 164 changed files with 40,305 additions and 35,990 deletions.
diff --git a/chrome/common/extensions/api/input_method_private.json b/chrome/common/extensions/api/input_method_private.json
@@ -25,7 +25,8 @@
                 "description": "The input method config object.",
                 "properties": {
                   "isPhysicalKeyboardAutocorrectEnabled": {"type": "boolean"},
-                  "isNewQPInputViewEnabled": {"type": "boolean"}
+                  "isNewQPInputViewEnabled": {"type": "boolean"},
+                  "isVoiceInputEnabled": {"type": "boolean"}
                 }
               }
             ]

diff --git a/chrome/test/data/chromeos/virtual_keyboard/layout_test.js b/chrome/test/data/chromeos/virtual_keyboard/layout_test.js
@@ -189,10 +189,12 @@ function testHandwritingLayoutAsync(testDoneCallback) {
         var backButton = candidateView.querySelector(
             '.inputview-candidate-button');
         assertEquals('HANDWRITING_BACK', backButton.textContent);
+        onSwitchToKeyset('us.compact.qwerty', function() {
+          assertEquals('us-compact-qwerty', getActiveView().id,
+             'compact layout is not active.');
+          testDoneCallback();
+        });
         mockTap(backButton);
-        assertEquals('us-compact-qwerty', getActiveView().id,
-                     'compact layout is not active.');
-        testDoneCallback();
       });
       mockTap(hwtSelect);
     });

diff --git a/third_party/google_input_tools/README.chromium b/third_party/google_input_tools/README.chromium
@@ -2,7 +2,7 @@ Name: Google Input Tools
 Short Name: google_input_tools
 URL: https://github.com/googlei18n/google-input-tools.git
 Version: 1.0.6.0
-Revision: @289b4a2e4b039c9a2654bb4b86db3c889d3cf814
+Revision: @9682ab568163879e00499bd94937016426afddfb
 License: Apache 2.0
 License File: LICENSE
 Security Critical: yes
@@ -22,7 +22,7 @@ Only includes the portion of google-input-tools required to build an inputview-
 based virtual keyboard.
 
 builder.py: Python script for building inputview.js.
-closure.gni: GN template for calling the closure builder. 
+closure.gni: GN template for calling the closure builder.
 inputview.gni: Convert build dependencies from gyp to gn format.
 inputview.gyp: Build file for generating inputview.js.
 inputview.gypi: Autogenerated by update script to define sources for inputview.

diff --git a/third_party/google_input_tools/inputview.gypi b/third_party/google_input_tools/inputview.gypi
@@ -41,18 +41,20 @@
       'src/chrome/os/inputview/elements/content/functionalkey.js',
       'src/chrome/os/inputview/elements/content/gaussianestimator.js',
       'src/chrome/os/inputview/elements/content/handwritingview.js',
+      'src/chrome/os/inputview/elements/content/indicator.js',
       'src/chrome/os/inputview/elements/content/keyboardview.js',
       'src/chrome/os/inputview/elements/content/keysetview.js',
+      'src/chrome/os/inputview/elements/content/material/spacekey.js',
       'src/chrome/os/inputview/elements/content/menuitem.js',
       'src/chrome/os/inputview/elements/content/menukey.js',
       'src/chrome/os/inputview/elements/content/menuview.js',
       'src/chrome/os/inputview/elements/content/modifierkey.js',
       'src/chrome/os/inputview/elements/content/morekeysshiftoperation.js',
-      'src/chrome/os/inputview/elements/content/pageindicator.js',
       'src/chrome/os/inputview/elements/content/softkey.js',
       'src/chrome/os/inputview/elements/content/spacekey.js',
       'src/chrome/os/inputview/elements/content/switcherkey.js',
       'src/chrome/os/inputview/elements/content/tabbarkey.js',
+      'src/chrome/os/inputview/elements/content/voiceview.js',
       'src/chrome/os/inputview/elements/element.js',
       'src/chrome/os/inputview/elements/elementtype.js',
       'src/chrome/os/inputview/elements/layout/extendedlayout.js',

diff --git a/third_party/google_input_tools/src/chrome/os/datasource.js b/third_party/google_input_tools/src/chrome/os/datasource.js
@@ -50,6 +50,17 @@ var DataSource = i18n.input.chrome.DataSource;
 goog.inherits(DataSource, EventTarget);
 
 
+/**
+ * The event type.
+ *
+ * @enum {string}
+ */
+DataSource.EventType = {
+  CANDIDATES_BACK: goog.events.getUniqueId('cb'),
+  READY: goog.events.getUniqueId('r')
+};
+
+
 /** @type {boolean} */
 DataSource.prototype.ready = false;
 
@@ -62,6 +73,14 @@ DataSource.prototype.ready = false;
 DataSource.prototype.correctionLevel = 0;
 
 
+/**
+ * Whether user dict is enabled.
+ *
+ * @protected {boolean}
+ */
+DataSource.prototype.enableUserDict = false;
+
+
 /**
  * The language code.
  *
@@ -115,6 +134,15 @@ DataSource.prototype.getInputToolCode = function() {
 };
 
 
+/**
+ * Sends completion request for a word.
+ *
+ * @param {string} word The word.
+ * @param {string} context The context.
+ */
+DataSource.prototype.sendCompletionRequestForWord = goog.functions.NULL;
+
+
 /**
  * Sends completion request.
  *
@@ -130,8 +158,8 @@ DataSource.prototype.sendCompletionRequest = goog.functions.NULL;
  *
  * @param {boolean} enabled
  */
-DataSource.prototype.setUserDictEnabled = function(enabled) {
-  this.userDictEnabled = enabled;
+DataSource.prototype.setEnableUserDict = function(enabled) {
+  this.enableUserDict = enabled;
 };
 
 
@@ -154,20 +182,18 @@ DataSource.prototype.setCorrectionLevel = function(level) {
 
 
 /**
- * Clears the data source.
+ * Commits text to the data source.
+ *
+ * @param {string} text The text to commit.
  */
-DataSource.prototype.clear = goog.functions.NULL;
+DataSource.prototype.commitText = goog.functions.NULL;
 
 
 /**
- * The event type.
- *
- * @enum {string}
+ * Clears the data source.
  */
-DataSource.EventType = {
-  CANDIDATES_BACK: goog.events.getUniqueId('cb'),
-  READY: goog.events.getUniqueId('r')
-};
+DataSource.prototype.clear = goog.functions.NULL;
+
 
 
 /**