Fix is_browser_shortcut; add a test.

chrome/browser/ui/cocoa/browser_window_cocoa.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 "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/debug/stack_trace.h"
 #include "base/logging.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/metrics/browser_window_histogram_helper.h"
@@ skipping 556 matching lines @@
                          security_info);
 }
 
 void BrowserWindowCocoa::ShowAppMenu() {
   // No-op. Mac doesn't support showing the menus via alt keys.
 }
 
 content::KeyboardEventProcessingResult
 BrowserWindowCocoa::PreHandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
+  base::debug::StackTrace s;
+  LOG(ERROR) << "BrowserWindowCocoa::PreHandleKeyboardEvent\n" << s.ToString();
   // Handle ESC to dismiss permission bubbles, but still forward it
   // to the window afterwards.
   if (event.windows_key_code == ui::VKEY_ESCAPE)
     [controller_ dismissPermissionBubble];
 
-  if (![BrowserWindowUtils shouldHandleKeyboardEvent:event])
+  if (![BrowserWindowUtils shouldHandleKeyboardEvent:event]) {
+    LOG(ERROR) << " > early exit; shouldn't handle event";
     return content::KeyboardEventProcessingResult::NOT_HANDLED;
+  }
 
   if (event.GetType() == blink::WebInputEvent::kRawKeyDown &&
       [controller_
           handledByExtensionCommand:event.os_event
-                           priority:ui::AcceleratorManager::kHighPriority])
+                           priority:ui::AcceleratorManager::kHighPriority]) {
+    LOG(ERROR) << " > handled by extension command";
     return content::KeyboardEventProcessingResult::HANDLED;
+  }
 
   int id = [BrowserWindowUtils getCommandId:event];
-  if (id == -1)
+  if (id == -1) {
+    LOG(ERROR) << " > not handled; no command id";
     return content::KeyboardEventProcessingResult::NOT_HANDLED;
+  }
 
   if (browser_->command_controller()->IsReservedCommandOrKey(id, event)) {
     using Result = content::KeyboardEventProcessingResult;
-    return [BrowserWindowUtils handleKeyboardEvent:event.os_event
-                                          inWindow:window()]
-               ? Result::HANDLED
-               : Result::NOT_HANDLED;
+    bool result = [BrowserWindowUtils handleKeyboardEvent:event.os_event
+                                                 inWindow:window()];
+    LOG(ERROR) << " > handleKeyboardEvent: returned " << result;
+    return result ? Result::HANDLED : Result::NOT_HANDLED;
   }
 
+  LOG(ERROR) << " > returning default";
   return content::KeyboardEventProcessingResult::NOT_HANDLED_IS_SHORTCUT;
 }
 
 void BrowserWindowCocoa::HandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   if ([BrowserWindowUtils shouldHandleKeyboardEvent:event]) {
     if (![BrowserWindowUtils handleKeyboardEvent:event.os_event
                                         inWindow:window()]) {
 
       // TODO(spqchan): This is a temporary fix for exit extension fullscreen.
@@ skipping 103 matching lines @@
 ExclusiveAccessContext* BrowserWindowCocoa::GetExclusiveAccessContext() {
   return [controller_ exclusiveAccessController];
 }
 
 void BrowserWindowCocoa::ShowImeWarningBubble(
     const extensions::Extension* extension,
     const base::Callback<void(ImeWarningBubblePermissionStatus status)>&
         callback) {
   NOTREACHED() << "The IME warning bubble is unsupported on this platform.";
 }