Add keyboard shortcuts for Mac content shell.

content/shell/shell_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.
 
 #include "content/shell/shell.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 81 matching lines @@
 const CGFloat kURLBarHeight = 24;
 
 // The minimum size of the window's content (in view coordinates)
 const CGFloat kMinimumWindowWidth = 400;
 const CGFloat kMinimumWindowHeight = 300;
 
 void MakeShellButton(NSRect* rect,
                      NSString* title,
                      NSView* parent,
                      int control,
-                     NSView* target) {
+                     NSView* target,
+                     NSString* key,
+                     NSUInteger modifier) {
   scoped_nsobject<NSButton> button([[NSButton alloc] initWithFrame:*rect]);
   [button setTitle:title];
   [button setBezelStyle:NSSmallSquareBezelStyle];
   [button setAutoresizingMask:(NSViewMaxXMargin | NSViewMinYMargin)];
   [button setTarget:target];
   [button setAction:@selector(performAction:)];
   [button setTag:control];
+  [button setKeyEquivalent:key];
+  [button setKeyEquivalentModifierMask:modifier];
   [parent addSubview:button];
   rect->origin.x += kButtonWidth;
 }
 
 }  // namespace
 
 namespace content {
 
 void Shell::PlatformInitialize() {
 }
@@ skipping 74 matching lines @@
   // clean itself up so we don't need to hold a reference.
   ContentShellWindowDelegate* delegate =
       [[ContentShellWindowDelegate alloc] initWithShell:this];
   [window_ setDelegate:delegate];
 
   NSRect button_frame =
       NSMakeRect(0, NSMaxY(initial_window_bounds) - kURLBarHeight,
                  kButtonWidth, kURLBarHeight);
 
   MakeShellButton(&button_frame, @"Back", content, IDC_NAV_BACK,
-                  (NSView*)delegate);
+                  (NSView*)delegate, @"[", NSCommandKeyMask);
   MakeShellButton(&button_frame, @"Forward", content, IDC_NAV_FORWARD,
-                  (NSView*)delegate);
+                  (NSView*)delegate, @"]", NSCommandKeyMask);
   MakeShellButton(&button_frame, @"Reload", content, IDC_NAV_RELOAD,
-                  (NSView*)delegate);
+                  (NSView*)delegate, @"r", NSCommandKeyMask);
   MakeShellButton(&button_frame, @"Stop", content, IDC_NAV_STOP,
-                  (NSView*)delegate);
+                  (NSView*)delegate, @".", NSCommandKeyMask);
 
   button_frame.size.width =
       NSWidth(initial_window_bounds) - NSMinX(button_frame);
   scoped_nsobject<NSTextField> url_edit_view(
       [[NSTextField alloc] initWithFrame:button_frame]);
   [content addSubview:url_edit_view];
   [url_edit_view setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];
   [url_edit_view setTarget:delegate];
   [url_edit_view setAction:@selector(takeURLStringValueFrom:)];
   [[url_edit_view cell] setWraps:NO];
@@ skipping 54 matching lines @@
     LoadURL(url);
   }
 }
 
 void Shell::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
   if (event.skip_in_browser)
     return;
 
   // The event handling to get this strictly right is a tangle; cheat here a bit
   // by just letting the menus have a chance at it.
-  if ([event.os_event type] == NSKeyDown)
+  if ([event.os_event type] == NSKeyDown) {
+    if (([event.os_event modifierFlags] & NSCommandKeyMask) &&
+        [[event.os_event characters] isEqual:@"l"]) {
+      [window_ makeFirstResponder:url_edit_view_];
+      return;
+    }
+
     [[NSApp mainMenu] performKeyEquivalent:event.os_event];
+  }
 }
 
 }  // namespace content