| Index: chrome/browser/ui/extensions/shell_window.h
|
| diff --git a/chrome/browser/ui/extensions/shell_window.h b/chrome/browser/ui/extensions/shell_window.h
|
| index 921cf633e92588da19aeb7f925a50e3eb913d5ee..d02b136693203cd017389df1a7f147f03e7fec1b 100644
|
| --- a/chrome/browser/ui/extensions/shell_window.h
|
| +++ b/chrome/browser/ui/extensions/shell_window.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/extensions/extension_function_dispatcher.h"
|
| +#include "chrome/browser/extensions/extension_keybinding_registry.h"
|
| #include "chrome/browser/extensions/image_loading_tracker.h"
|
| #include "chrome/browser/sessions/session_id.h"
|
| #include "chrome/browser/ui/base_window.h"
|
| @@ -41,7 +42,8 @@ class ShellWindow : public content::NotificationObserver,
|
| public content::WebContentsDelegate,
|
| public content::WebContentsObserver,
|
| public ExtensionFunctionDispatcher::Delegate,
|
| - public ImageLoadingTracker::Observer {
|
| + public ImageLoadingTracker::Observer,
|
| + public extensions::ExtensionKeybindingRegistry::Delegate {
|
| public:
|
| struct CreateParams {
|
| enum Frame {
|
| @@ -173,6 +175,10 @@ class ShellWindow : public content::NotificationObserver,
|
| const std::string& extension_id,
|
| int index) OVERRIDE;
|
|
|
| + // extensions::ExtensionKeybindingRegistry::Delegate implementation.
|
| + virtual extensions::ActiveTabPermissionGranter*
|
| + GetActiveTabPermissionGranter() OVERRIDE;
|
| +
|
| Profile* profile_; // weak pointer - owned by ProfileManager.
|
| // weak pointer - owned by ExtensionService.
|
| const extensions::Extension* extension_;
|
|
|