MacViews: tryjobs for toolkit_views=1

ui/events/keycodes/keyboard_code_conversion_mac.mm

 // Copyright (c) 2012 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.
 
 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
 
 #include <algorithm>
 
 #import <Carbon/Carbon.h>
 
@@ skipping 47 matching lines @@
   { VKEY_END /* 0x23 */, kVK_End, NSEndFunctionKey },
   { VKEY_HOME /* 0x24 */, kVK_Home, NSHomeFunctionKey },
   { VKEY_LEFT /* 0x25 */, kVK_LeftArrow, NSLeftArrowFunctionKey },
   { VKEY_UP /* 0x26 */, kVK_UpArrow, NSUpArrowFunctionKey },
   { VKEY_RIGHT /* 0x27 */, kVK_RightArrow, NSRightArrowFunctionKey },
   { VKEY_DOWN /* 0x28 */, kVK_DownArrow, NSDownArrowFunctionKey },
   { VKEY_SELECT /* 0x29 */, -1, 0 },
   { VKEY_PRINT /* 0x2A */, -1, NSPrintFunctionKey },
   { VKEY_EXECUTE /* 0x2B */, -1, NSExecuteFunctionKey },
   { VKEY_SNAPSHOT /* 0x2C */, -1, NSPrintScreenFunctionKey },
-  { VKEY_INSERT /* 0x2D */, -1, NSInsertFunctionKey },
+  { VKEY_INSERT /* 0x2D */, kVK_Help, NSInsertFunctionKey },
   { VKEY_DELETE /* 0x2E */, kVK_ForwardDelete, NSDeleteFunctionKey },
   { VKEY_HELP /* 0x2F */, kVK_Help, kHelpCharCode },
   { VKEY_0 /* 0x30 */, kVK_ANSI_0, '0' },
   { VKEY_1 /* 0x31 */, kVK_ANSI_1, '1' },
   { VKEY_2 /* 0x32 */, kVK_ANSI_2, '2' },
   { VKEY_3 /* 0x33 */, kVK_ANSI_3, '3' },
   { VKEY_4 /* 0x34 */, kVK_ANSI_4, '4' },
   { VKEY_5 /* 0x35 */, kVK_ANSI_5, '5' },
   { VKEY_6 /* 0x36 */, kVK_ANSI_6, '6' },
   { VKEY_7 /* 0x37 */, kVK_ANSI_7, '7' },
@@ skipping 389 matching lines @@
   int macKeycode = ptr->macKeycode;
   if (keyboard_character)
     *keyboard_character = ptr->characterIgnoringAllModifiers;
 
   if (!us_keyboard_shifted_character)
     return macKeycode;
 
   *us_keyboard_shifted_character = ptr->characterIgnoringAllModifiers;
 
   // Fill in |us_keyboard_shifted_character| according to flags.
-  if (flags & NSShiftKeyMask) {
+  if (keycode >= VKEY_A && keycode <= VKEY_Z) {
+    // Letter keys need to consider caps lock.
+    bool shift_pressed = (flags & NSShiftKeyMask) != 0;
+    bool caps_pressed = (flags & NSAlphaShiftKeyMask) != 0;
+    if (shift_pressed != caps_pressed)
+      *us_keyboard_shifted_character = 'A' + (keycode - VKEY_A);
+
+  } else if (flags & NSShiftKeyMask) {
     if (keycode >= VKEY_0 && keycode <= VKEY_9) {
       *us_keyboard_shifted_character =
           kShiftCharsForNumberKeys[keycode - VKEY_0];
-    } else if (keycode >= VKEY_A && keycode <= VKEY_Z) {
-      *us_keyboard_shifted_character = 'A' + (keycode - VKEY_A);
+
     } else {
       switch (macKeycode) {
         case kVK_ANSI_Grave:
           *us_keyboard_shifted_character = '~';
           break;
         case kVK_ANSI_Minus:
           *us_keyboard_shifted_character = '_';
           break;
         case kVK_ANSI_Equal:
           *us_keyboard_shifted_character = '+';
@@ skipping 49 matching lines @@
       return code;
   }
   return KeyboardCodeFromKeyCode([event keyCode]);
 }
 
 DomCode CodeFromNSEvent(NSEvent* event) {
   return ui::KeycodeConverter::NativeKeycodeToDomCode([event keyCode]);
 }
 
 }  // namespace ui