views: Fix shifted keyevents in textfield.

views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 466 matching lines @@
       SchedulePaint();
     }
   }
   return false;
 }
 
 char16 NativeTextfieldViews::GetPrintableChar(const KeyEvent& key_event) {
   // TODO(oshima): IME, i18n support.
   // This only works for UCS-2 characters.
   app::KeyboardCode key_code = key_event.GetKeyCode();
-  bool shift = key_event.IsShiftDown() ^ key_event.IsCapsLockDown();
+  bool shift = key_event.IsShiftDown();
+  bool upper = shift ^ key_event.IsCapsLockDown();
   // TODO(oshima): We should have a utility function
   // under app to convert a KeyboardCode to a printable character,
   // probably in keyboard_code_conversion{.h, _x
   switch (key_code) {
     case app::VKEY_NUMPAD0:
       return '0';
     case app::VKEY_NUMPAD1:
       return '1';
     case app::VKEY_NUMPAD2:
       return '2';
@@ skipping 63 matching lines @@
     case app::VKEY_Q:
     case app::VKEY_R:
     case app::VKEY_S:
     case app::VKEY_T:
     case app::VKEY_U:
     case app::VKEY_V:
     case app::VKEY_W:
     case app::VKEY_X:
     case app::VKEY_Y:
     case app::VKEY_Z:
-      return (shift ? 'A' : 'a') + (key_code - app::VKEY_A);
+      return (upper ? 'A' : 'a') + (key_code - app::VKEY_A);
     case app::VKEY_OEM_1:
       return shift ? ':' : ';';
     case app::VKEY_OEM_PLUS:
       return shift ? '+' : '=';
     case app::VKEY_OEM_COMMA:
       return shift ? '<' : ',';
     case app::VKEY_OEM_MINUS:
       return shift ? '_' : '-';
     case app::VKEY_OEM_PERIOD:
       return shift ? '>' : '.';
@@ skipping 107 matching lines @@
 }
 
 void NativeTextfieldViews::TextfieldBorder::SetInsets(int top,
                                                       int left,
                                                       int bottom,
                                                       int right) {
   insets_.Set(top, left, bottom, right);
 }
 
 }  // namespace views