| Index: third_party/google_input_tools/src/chrome/os/inputview/adapter.js
|
| diff --git a/third_party/google_input_tools/src/chrome/os/inputview/adapter.js b/third_party/google_input_tools/src/chrome/os/inputview/adapter.js
|
| index b6664780ec04f6d6c98fcb799e8d73ee579e8487..3c3eaaa37acf7889d393251718e707d68317ffe4 100644
|
| --- a/third_party/google_input_tools/src/chrome/os/inputview/adapter.js
|
| +++ b/third_party/google_input_tools/src/chrome/os/inputview/adapter.js
|
| @@ -38,7 +38,6 @@ var ContextType = i18n.input.chrome.message.ContextType;
|
| var FeatureTracker = i18n.input.chrome.inputview.FeatureTracker;
|
| var FeatureName = i18n.input.chrome.inputview.FeatureName;
|
| var Name = i18n.input.chrome.message.Name;
|
| -var SizeSpec = i18n.input.chrome.inputview.SizeSpec;
|
| var Type = i18n.input.chrome.message.Type;
|
|
|
|
|
| @@ -369,7 +368,7 @@ Adapter.prototype.isGestureDeletionEnabled = function() {
|
| if (this.contextType == ContextType.URL) {
|
| return false;
|
| }
|
| - return this.features.isEnabled(FeatureName.GESTURE_EDITTING);
|
| + return this.features.isEnabled(FeatureName.GESTURE_DELETION);
|
| };
|
|
|
|
|
| @@ -403,7 +402,7 @@ Adapter.prototype.queryCurrentSite = function() {
|
| var criteria = {'active': true, 'lastFocusedWindow': true};
|
| if (chrome && chrome.tabs) {
|
| chrome.tabs.query(criteria, function(tabs) {
|
| - tabs[0] && adapter.setCurrentSite_(tabs[0].url);
|
| + tabs[0] && adapter.setCurrentSite_(tabs[0].url);
|
| });
|
| }
|
| };
|
| @@ -504,7 +503,8 @@ Adapter.prototype.initialize = function(languageCode) {
|
| this.maybeDispatchSettingsReadyEvent_();
|
| }).bind(this));
|
| inputview.getInputMethodConfig((function(config) {
|
| - this.isQPInputView = !!config['isNewQPInputViewEnabled'];
|
| + this.isQPInputView = !!config['isNewQPInputViewEnabled'] ||
|
| + !!config['isNewMDInputViewEnabled'];
|
| var voiceEnabled = config['isVoiceInputEnabled'];
|
| if (goog.isDef(voiceEnabled)) {
|
| this.isVoiceInputEnabled = !!voiceEnabled;
|
|
|