Views: Implement keyboard shortcuts for the remove and edit button in the bookmark bubble.

chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc

 // Copyright (c) 2012 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/ui/views/bookmarks/bookmark_bubble_view.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 107 matching lines @@
   // destroyed asynchronously and the shown state will be checked before then.
   DCHECK_EQ(bookmark_bubble_, this);
   bookmark_bubble_ = NULL;
 
   if (observer_)
     observer_->OnBookmarkBubbleHidden();
 }
 
 bool BookmarkBubbleView::AcceleratorPressed(
     const ui::Accelerator& accelerator) {
-  if (accelerator.key_code() == ui::VKEY_RETURN) {
-     if (edit_button_->HasFocus())
-       HandleButtonPressed(edit_button_);
-     else
-       HandleButtonPressed(close_button_);
-     return true;
-  } else if (accelerator.key_code() == ui::VKEY_ESCAPE) {
+  ui::KeyboardCode key_code = accelerator.key_code();
+  if (key_code == ui::VKEY_RETURN) {

[sky, 2014/08/04 17:12:03]

I think we should keep return as we had it.

[Lei Zhang, 2014/08/04 18:59:57]

The "if (edit_button_->HasFocus())" block doesn't seem to do get reached. Even
if I remove it, tabbing to the edit button and pressing return still works.

+    HandleButtonPressed(close_button_);
+    return true;
+  } else if (key_code == ui::VKEY_ESCAPE) {

[sky, 2014/08/04 17:12:03]

nit: no else after a return (here and your new code).

[Lei Zhang, 2014/08/04 19:05:55]

Done.

     remove_bookmark_ = newly_bookmarked_;
     apply_edits_ = false;
+  } else if (key_code == ui::VKEY_E && accelerator.IsAltDown()) {
+    HandleButtonPressed(edit_button_);
+    return true;
+  } else if (key_code == ui::VKEY_R && accelerator.IsAltDown()) {
+    HandleButtonPressed(remove_button_);
+    return true;
   }
 
   return BubbleDelegateView::AcceleratorPressed(accelerator);
 }
 
 void BookmarkBubbleView::Init() {
   views::Label* title_label = new views::Label(
       l10n_util::GetStringUTF16(
           newly_bookmarked_ ? IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED :
                               IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK));
@@ skipping 97 matching lines @@
                   GridLayout::USE_PREF,
                   0,
                   0);
     layout->StartRow(0, SYNC_PROMO_COLUMN_SET_ID);
 
     sync_promo_view_ = new BookmarkSyncPromoView(delegate_.get());
     layout->AddView(sync_promo_view_);
   }
 
   AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
+  AddAccelerator(ui::Accelerator(ui::VKEY_E, ui::EF_ALT_DOWN));
+  AddAccelerator(ui::Accelerator(ui::VKEY_R, ui::EF_ALT_DOWN));
 }
 
 BookmarkBubbleView::BookmarkBubbleView(
     views::View* anchor_view,
     BookmarkBubbleViewObserver* observer,
     scoped_ptr<BookmarkBubbleDelegate> delegate,
     Profile* profile,
     const GURL& url,
     bool newly_bookmarked)
     : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
@@ skipping 92 matching lines @@
   if (node) {
     const base::string16 new_title = title_tf_->text();
     if (new_title != node->GetTitle()) {
       model->SetTitle(node, new_title);
       content::RecordAction(
           UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"));
     }
     parent_model_.MaybeChangeParent(node, parent_combobox_->selected_index());
   }
 }