1 files changed, 5 insertions, 9 deletions
diff --git a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/keysetview.js b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/keysetview.js
index 465528a..2ccddcb 100644
--- a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/keysetview.js
+++ b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/keysetview.js
@@ -278,10 +278,6 @@ KeysetView.prototype.createDom = function() {
   var elem = this.getElement();
   elem.id = this.keyboardCode_.replace(/\./g, '-');
   goog.dom.classlist.add(elem, i18n.input.chrome.inputview.Css.VIEW);
-  if (this.disableCandidateView) {
-    goog.dom.classlist.add(
-        elem, i18n.input.chrome.inputview.Css.CANDIDATE_VIEW_DISABLED);
-  }
 
   var children = this.layoutData_['children'];
   for (var i = 0; i < children.length; i++) {
@@ -687,6 +683,11 @@ KeysetView.prototype.createKey_ = function(spec, hasAltGrCharacterInTheKeyset) {
           compactKeyModel, undefined);
       break;
     case ElementType.CHARACTER_KEY:
+      if (characters.length == 1) {
+        // If there is no character for shift state, just make the character of
+        // default state to be that one.
+        characters.push(characters[0]);
+      }
       var isLetterKey = i18n.input.chrome.inputview.util.isLetterKey(
           characters);
       var enableShiftRendering = false;
@@ -811,11 +812,6 @@ KeysetView.prototype.activate = function(rawKeyset) {
   } else {
     goog.dom.classlist.remove(this.getElement(), Css.PINYIN);
   }
-  // Switches between compact zhuyin and zhuyin needs to change the controlelr,
-  // since they use different background controllers.
-  if (rawKeyset.indexOf('zhuyin') != -1) {
-    this.adapter.setController(rawKeyset, this.languageCode);
-  }
 };