WidgetWin was an accelerator target, it does not need to.

BUG=None
TEST=make sure Esc still works in the bookmark bubble and that accelerators work as expected.
Review URL: http://codereview.chromium.org/271067

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28842 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 16 deletions

diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index 16f4860..a4f2181 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -328,6 +328,10 @@ void WidgetWin::ViewHierarchyChanged(bool is_add, View *parent,
     drop_target_->ResetTargetViewIfEquals(child);
 }
 
+bool WidgetWin::GetAccelerator(int cmd_id, Accelerator* accelerator) {
+  return false;
+}
+
 void WidgetWin::SetUseLayeredBuffer(bool use_layered_buffer) {
   if (use_layered_buffer_ == use_layered_buffer)
     return;
@@ -423,15 +427,6 @@ void WidgetWin::SetFocusTraversableParentView(View* parent_view) {
   root_view_->SetFocusTraversableParentView(parent_view);
 }
 
-bool WidgetWin::AcceleratorPressed(const Accelerator& accelerator) {
-  return false;
-}
-
-bool WidgetWin::GetAccelerator(int cmd_id, Accelerator* accelerator) {
-  return false;
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////
 // Message handlers
 
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index 147072e..40b3387 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -69,8 +69,7 @@ const int WM_NCUAHDRAWFRAME = 0xAF;
 class WidgetWin : public app::WindowImpl,
                   public Widget,
                   public MessageLoopForUI::Observer,
-                  public FocusTraversable,
-                  public AcceleratorTarget {
+                  public FocusTraversable {
  public:
   WidgetWin();
   virtual ~WidgetWin();
@@ -205,6 +204,7 @@ class WidgetWin : public app::WindowImpl,
   virtual FocusManager* GetFocusManager();
   virtual void ViewHierarchyChanged(bool is_add, View *parent,
                                     View *child);
+  virtual bool GetAccelerator(int cmd_id, Accelerator* accelerator);
 
   // Overridden from MessageLoop::Observer:
   void WillProcessMessage(const MSG& msg);
@@ -223,11 +223,6 @@ class WidgetWin : public app::WindowImpl,
   void SetFocusTraversableParent(FocusTraversable* parent);
   void SetFocusTraversableParentView(View* parent_view);
 
-  // Overridden from AcceleratorTarget:
-  virtual bool AcceleratorPressed(const Accelerator& accelerator);
-
-  virtual bool GetAccelerator(int cmd_id, Accelerator* accelerator);
-
   BOOL IsWindow() const {
     return ::IsWindow(GetNativeView());
   }