Relands cl 16982 as it wasn't the cause of the build breakage. Here's...

chrome/browser/views/bookmark_manager_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_
 
 #include "base/ref_counted.h"
 #include "base/task.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
@@ skipping 75 matching lines @@
   virtual std::wstring GetWindowTitle() const;
   virtual std::wstring GetWindowName() const;
   virtual View* GetContentsView() { return this; }
   // TODO(sky): implement these when we have an icon.
   //virtual SkBitmap GetWindowIcon();
   //virtual bool ShouldShowWindowIcon() const { return true; }
   virtual void WindowClosing();
 
   Profile* profile() const { return profile_; }
 
+ protected:
+  // View methods.
+  virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
+
  private:
   // TableViewObserver methods.
   virtual void OnSelectionChanged() {}
   // Overriden to open the selected table nodes in the current browser.
   virtual void OnDoubleClick();
   virtual void OnMiddleClick();
   virtual void OnTableViewDelete(views::TableView* table);
   virtual void OnKeyDown(unsigned short virtual_keycode);
 
   // TreeViewController methods.
@@ skipping 106 matching lines @@
   // Import/export file dialog.
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
   // Factory used for delaying search.
   ScopedRunnableMethodFactory<BookmarkManagerView> search_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkManagerView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_