Reverting 16982.

Broke Modules Mac
Review URL: http://codereview.chromium.org/113901

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

2 files changed, 0 insertions, 15 deletions

diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 761f34c..eb0e3d3 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -206,9 +206,6 @@ BookmarkManagerView::BookmarkManagerView(Profile* profile)
   layout->StartRow(1, split_cs_id);
   layout->AddView(split_view_);
 
-  // Press Ctrl-W to close bookmark manager window.
-  AddAccelerator(views::Accelerator('W', false, true, false));
-
   BookmarkModel* bookmark_model = profile_->GetBookmarkModel();
   if (!bookmark_model->IsLoaded())
     bookmark_model->AddObserver(this);
@@ -343,14 +340,6 @@ void BookmarkManagerView::WindowClosing() {
       prefs::kBookmarkManagerSplitLocation, split_view_->divider_x());
 }
 
-bool BookmarkManagerView::AcceleratorPressed(
-    const views::Accelerator& accelerator) {
-  // Ctrl-W to close bookmark manager.
-  DCHECK(accelerator.GetKeyCode() == 'W' && accelerator.IsCtrlDown());
-  window()->Close();
-  return true;
-}
-
 void BookmarkManagerView::OnDoubleClick() {
   std::vector<BookmarkNode*> nodes = GetSelectedTableNodes();
   if (nodes.empty())
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index 814f3a6..710363a 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -93,10 +93,6 @@ class BookmarkManagerView : public views::View,
 
   Profile* profile() const { return profile_; }
 
- protected:
-  // View methods.
-  virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
-
  private:
   // TableViewObserver methods.
   virtual void OnSelectionChanged() {}