Skip to content

Commit

Permalink
Update Google Input Tools.
Browse files Browse the repository at this point in the history
BUG=450050

Review URL: https://codereview.chromium.org/1013263002

Cr-Commit-Position: refs/heads/master@{#320989}
  • Loading branch information
wnwen authored and Commit bot committed Mar 17, 2015
1 parent aea1789 commit a13b511
Show file tree
Hide file tree
Showing 20 changed files with 589 additions and 268 deletions.
4 changes: 2 additions & 2 deletions third_party/google_input_tools/README.chromium
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Name: Google Input Tools
Short Name: google_input_tools
URL: https://github.com/googlei18n/google-input-tools.git
Version: 1.0.6.2
Revision: @1af2274f7a754bb3f18a3618f0e94981d682bc16
Version: 1.0.4.3
Revision: @3730e096a782f1c74a3db0831aff63fb74540b97
License: Apache 2.0
License File: LICENSE
Security Critical: yes
Expand Down
1 change: 1 addition & 0 deletions third_party/google_input_tools/inputview.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
'src/chrome/os/message/contexttype.js',
'src/chrome/os/message/event.js',
'src/chrome/os/message/name.js',
'src/chrome/os/message/source.js',
'src/chrome/os/message/type.js',
'src/chrome/os/sounds/soundcontroller.js',
'src/chrome/os/sounds/sounds.js',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1704,10 +1704,10 @@
"message": "ledningsstik"
},
"d83d_dd0d": {
"message": "forst\u00f8rrelsesglas (venstre)"
"message": "lup (venstre)"
},
"d83d_dd0e": {
"message": "forst\u00f8rrelsesglas (h\u00f8jre)"
"message": "lup (h\u00f8jre)"
},
"d83d_dd0f": {
"message": "l\u00e5s med pen"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down Expand Up @@ -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);
};


Expand Down Expand Up @@ -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);
});
}
};
Expand Down Expand Up @@ -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;
Expand Down
Loading

0 comments on commit a13b511

Please sign in to comment.