| Index: chrome/browser/ui/cocoa/browser_window_cocoa.h
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
|
| index 8e7679899688ae74821b31fea6dd25eb3810c9a6..39a40ed11705d6ee56728c74a9597651d86c88b6 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
|
| +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
|
| @@ -9,6 +9,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/browser/api/prefs/pref_change_registrar.h"
|
| #include "chrome/browser/bookmarks/bookmark_model.h"
|
| +#include "chrome/browser/extensions/extension_keybinding_registry.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "ui/base/ui_base_types.h"
|
| @@ -21,6 +22,7 @@ class Browser;
|
| @class NSWindow;
|
|
|
| namespace extensions {
|
| +class ActiveTabPermissionGranter;
|
| class Extension;
|
| }
|
|
|
| @@ -28,8 +30,10 @@ class Extension;
|
| // the Cocoa NSWindow. Cross-platform code will interact with this object when
|
| // it needs to manipulate the window.
|
|
|
| -class BrowserWindowCocoa : public BrowserWindow,
|
| - public content::NotificationObserver {
|
| +class BrowserWindowCocoa :
|
| + public BrowserWindow,
|
| + public content::NotificationObserver,
|
| + public extensions::ExtensionKeybindingRegistry::Delegate {
|
| public:
|
| BrowserWindowCocoa(Browser* browser,
|
| BrowserWindowController* controller);
|
| @@ -150,6 +154,10 @@ class BrowserWindowCocoa : public BrowserWindow,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
|
|
| + // Overridden from ExtensionKeybindingRegistry::Delegate:
|
| + virtual extensions::ActiveTabPermissionGranter*
|
| + GetActiveTabPermissionGranter() OVERRIDE;
|
| +
|
| // Adds the given FindBar cocoa controller to this browser window.
|
| void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller);
|
|
|
|
|