1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/resources/keyboard/common.js b/chrome/browser/resources/keyboard/common.js
index 4a6b138..486f006 100644
--- a/chrome/browser/resources/keyboard/common.js
+++ b/chrome/browser/resources/keyboard/common.js
@@ -11,7 +11,7 @@ var SHIFT_MODE = 'shift';
 var NUMBER_MODE = 'number';
 var SYMBOL_MODE = 'symbol';
 var MODES = [ KEY_MODE, SHIFT_MODE, NUMBER_MODE, SYMBOL_MODE ];
-var currentMode = KEY_MODE;
+var currentMode = SHIFT_MODE;
 var MODE_TRANSITIONS = {};
 
 MODE_TRANSITIONS[KEY_MODE + SHIFT_MODE] = SHIFT_MODE;
@@ -97,16 +97,20 @@ function sendKey(key, type) {
     if (chrome.experimental) {
       chrome.experimental.input.sendKeyboardEvent(keyEvent);
     }
+    // Exit shift mode after pressing any key but space.
+    if (currentMode == SHIFT_MODE && key != 'Spacebar') {
+      transitionMode(SHIFT_MODE);
+    }
+    // Enter shift mode after typing a period for a new sentence.
+    if (currentMode != SHIFT_MODE && key == '.') {
+      transitionMode(SHIFT_MODE);
+    }
   }
   if (!type || type == 'keyup') {
     keyEvent.type = 'keyup';
     if (chrome.experimental) {
       chrome.experimental.input.sendKeyboardEvent(keyEvent);
     }
-    // Exit shift mode after completing any shifted keystroke.
-    if (currentMode == SHIFT_MODE) {
-      transitionMode(SHIFT_MODE);
-    }
   }
 }