Chromium Code Reviews| Index: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc |
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc |
| index 614c947c9af4481f8236d65c7e68c6f84464dfec..c89dbf50a40fb40b63e8c365181eb83f3ddc773c 100644 |
| --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc |
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc |
| @@ -125,15 +125,19 @@ void BookmarkBubbleView::WindowClosing() { |
| 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
|
| + 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 cod
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); |
| @@ -251,6 +255,8 @@ void BookmarkBubbleView::Init() { |
| } |
| 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( |