diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 22:03:31 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 22:03:31 +0000 |
| commit | a73b21f871e0e5a0081704f46f8477b4650c2aa2 (patch) | |
| tree | 0a059fe269f8d162188c9ef09f50ff29feca534f /apps/app_window.h | |
| parent | 44e062a20e7e48a2c1aaaac445dbcca8bc1373d4 (diff) | |
| download | chromium_src-a73b21f871e0e5a0081704f46f8477b4650c2aa2.zip chromium_src-a73b21f871e0e5a0081704f46f8477b4650c2aa2.tar.gz chromium_src-a73b21f871e0e5a0081704f46f8477b4650c2aa2.tar.bz2 | |
Use NULL for ExtensionKeyBindingRegistry::Delegate for app windows.
This avoids forcing AppWindow to be a delegate that does nothing.
Review URL: https://codereview.chromium.org/180633012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_window.h')
| -rw-r--r-- | apps/app_window.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/app_window.h b/apps/app_window.h index 8403153..2614a40 100644 --- a/apps/app_window.h +++ b/apps/app_window.h @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/extension_icon_image.h" -#include "chrome/browser/extensions/extension_keybinding_registry.h" #include "chrome/browser/sessions/session_id.h" #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" #include "content/public/browser/notification_observer.h" @@ -82,7 +81,6 @@ class AppWindow : public content::NotificationObserver, public content::WebContentsDelegate, public content::WebContentsObserver, public web_modal::WebContentsModalDialogManagerDelegate, - public extensions::ExtensionKeybindingRegistry::Delegate, public extensions::IconImage::Observer { public: enum WindowType { @@ -424,10 +422,6 @@ class AppWindow : public content::NotificationObserver, // Update the always-on-top bit in the native app window. void UpdateNativeAlwaysOnTop(); - // extensions::ExtensionKeybindingRegistry::Delegate implementation. - virtual extensions::ActiveTabPermissionGranter* - GetActiveTabPermissionGranter() OVERRIDE; - // web_modal::WebContentsModalDialogManagerDelegate implementation. virtual web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() OVERRIDE; |