Lands http://codereview.chromium.org/115505 for bug...

chrome/browser/views/bookmark_manager_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/bookmark_manager_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
@@ skipping 188 matching lines @@
   layout->AddView(tools_menu_button);
   layout->AddView(new views::Label(
       l10n_util::GetString(IDS_BOOKMARK_MANAGER_SEARCH_TITLE)));
   layout->AddView(search_tf_);
 
   layout->AddPaddingRow(0, 3); // 3px padding between rows.
 
   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);
 }
 
 BookmarkManagerView::~BookmarkManagerView() {
   if (select_file_dialog_.get())
     select_file_dialog_->ListenerDestroyed();
 
   if (!GetBookmarkModel()->IsLoaded()) {
@@ skipping 114 matching lines @@
 
 std::wstring BookmarkManagerView::GetWindowName() const {
   return prefs::kBookmarkManagerPlacement;
 }
 
 void BookmarkManagerView::WindowClosing() {
   g_browser_process->local_state()->SetInteger(
       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())
     return;
   if (nodes.size() == 1 && nodes[0]->is_folder()) {
     // Double click on a folder descends into the folder.
     SelectInTree(nodes[0]);
     return;
   }
   // TODO(sky): OnDoubleClick needs a handle to the current mouse event so that
@@ skipping 404 matching lines @@
   file_type_info.extensions.resize(1);
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
   file_type_info.include_all_files = true;
   select_file_dialog_ = SelectFileDialog::Create(this);
   select_file_dialog_->SelectFile(
       SelectFileDialog::SELECT_SAVEAS_FILE, std::wstring(),
       FilePath(FILE_PATH_LITERAL("bookmarks.html")), &file_type_info, 0,
       L"html", GetWidget()->GetNativeView(),
       reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_EXPORT_MENU));
 }