Index: chrome/browser/ui/views/frame/browser_view.h |
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h |
index d2fce2f9bccee11c7f95cc34aa6648ef5c917c70..5d4341a0d48dd9e84d7bb6b6aa9e7d2d6ff35899 100644 |
--- a/chrome/browser/ui/views/frame/browser_view.h |
+++ b/chrome/browser/ui/views/frame/browser_view.h |
@@ -16,15 +16,12 @@ |
#include "base/timer/timer.h" |
#include "build/build_config.h" |
#include "chrome/browser/devtools/devtools_window.h" |
-#include "chrome/browser/extensions/extension_commands_global_registry.h" |
-#include "chrome/browser/extensions/extension_keybinding_registry.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_window.h" |
#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" |
#include "chrome/browser/ui/infobar_container_delegate.h" |
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
#include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h" |
-#include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h" |
#include "chrome/browser/ui/views/frame/browser_frame.h" |
#include "chrome/browser/ui/views/frame/contents_web_view.h" |
#include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
@@ -68,8 +65,6 @@ class JumpList; |
#endif |
namespace extensions { |
-class ActiveTabPermissionGranter; |
-class Command; |
class Extension; |
} |
@@ -95,8 +90,7 @@ class BrowserView : public BrowserWindow, |
public LoadCompleteListener::Delegate, |
public OmniboxPopupModelObserver, |
public ExclusiveAccessContext, |
- public ExclusiveAccessBubbleViewsContext, |
- public extensions::ExtensionKeybindingRegistry::Delegate { |
+ public ExclusiveAccessBubbleViewsContext { |
public: |
// The browser view's class name. |
static const char kViewClassName[]; |
@@ -472,10 +466,6 @@ class BrowserView : public BrowserWindow, |
bool IsImmersiveModeEnabled() override; |
gfx::Rect GetTopContainerBoundsInScreen() override; |
- // extension::ExtensionKeybindingRegistry::Delegate overrides |
- extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter() |
- override; |
- |
// Testing interface: |
views::View* GetContentsContainerForTest() { return contents_container_; } |
views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } |
@@ -731,9 +721,6 @@ class BrowserView : public BrowserWindow, |
SigninViewController signin_view_controller_; |
- // The class that registers for keyboard shortcuts for extension commands. |
- scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; |
- |
mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
DISALLOW_COPY_AND_ASSIGN(BrowserView); |