From a73b21f871e0e5a0081704f46f8477b4650c2aa2 Mon Sep 17 00:00:00 2001 From: "yoz@chromium.org" Date: Tue, 4 Mar 2014 22:03:31 +0000 Subject: 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 --- apps/app_window.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'apps/app_window.h') 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; -- cgit v1.1