mac: Allow WebContents key handling to supplant extension overrides of the bookmark shortcut.

chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_
 #define CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
 #include "apps/size_constraints.h"
 #include "apps/ui/native_app_window.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/common/draggable_region.h"
+#include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/gfx/rect.h"
 
 namespace apps {
 class AppWindow;
 }
 
 class ExtensionKeybindingRegistryCocoa;
 class NativeAppWindowCocoa;
 @class ShellNSWindow;
 class SkRegion;
 
 // A window controller for a minimal window to host a web app view. Passes
 // Objective-C notifications to the C++ bridge.
 @interface NativeAppWindowController : NSWindowController
                                       <NSWindowDelegate,
                                        BrowserCommandExecutor> {
  @private
   NativeAppWindowCocoa* appWindow_;  // Weak; owns self.
 }
 
 @property(assign, nonatomic) NativeAppWindowCocoa* appWindow;
 
 // Consults the Command Registry to see if this |event| needs to be handled as
 // an extension command and returns YES if so (NO otherwise).
-- (BOOL)handledByExtensionCommand:(NSEvent*)event;
+// Only extensions with the given |priority| are considered.
+- (BOOL)handledByExtensionCommand:(NSEvent*)event
+    priority:(ui::AcceleratorManager::HandlerPriority)priority;
 
 @end
 
 // Cocoa bridge to AppWindow.
 class NativeAppWindowCocoa : public apps::NativeAppWindow,
                              public content::WebContentsObserver {
  public:
   NativeAppWindowCocoa(apps::AppWindow* app_window,
                        const apps::AppWindow::CreateParams& params);
 
@@ skipping 48 matching lines @@
   // Called when the window is zoomed (maximized or de-maximized).
   void WindowWillZoom();
 
   // Called when the window enters fullscreen.
   void WindowDidEnterFullscreen();
 
   // Called when the window exits fullscreen.
   void WindowDidExitFullscreen();
 
   // Called to handle a key event.
-  bool HandledByExtensionCommand(NSEvent* event);
+  bool HandledByExtensionCommand(
+      NSEvent* event,
+      ui::AcceleratorManager::HandlerPriority priority);
 
   // Returns true if |point| in local Cocoa coordinate system falls within
   // the draggable region.
   bool IsWithinDraggableRegion(NSPoint point) const;
 
   NSRect restored_bounds() const { return restored_bounds_; }
 
  protected:
   // NativeAppWindow implementation.
   virtual void SetFullscreen(int fullscreen_types) OVERRIDE;
@@ skipping 89 matching lines @@
   std::vector<extensions::DraggableRegion> draggable_regions_;
 
   // The Extension Command Registry used to determine which keyboard events to
   // handle.
   scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowCocoa);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_