Commit ad88587f authored by thestig@chromium.org's avatar thestig@chromium.org

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

Review URL: https://codereview.chromium.org/441593002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287706 0039d316-1c4b-4281-b951-d872f2087c98
parent 8f959f52
...@@ -125,13 +125,20 @@ void BookmarkBubbleView::WindowClosing() { ...@@ -125,13 +125,20 @@ void BookmarkBubbleView::WindowClosing() {
bool BookmarkBubbleView::AcceleratorPressed( bool BookmarkBubbleView::AcceleratorPressed(
const ui::Accelerator& accelerator) { const ui::Accelerator& accelerator) {
if (accelerator.key_code() == ui::VKEY_RETURN) { ui::KeyboardCode key_code = accelerator.key_code();
if (edit_button_->HasFocus()) if (key_code == ui::VKEY_RETURN) {
HandleButtonPressed(edit_button_);
else
HandleButtonPressed(close_button_); HandleButtonPressed(close_button_);
return true; return true;
} else if (accelerator.key_code() == ui::VKEY_ESCAPE) { }
if (key_code == ui::VKEY_E && accelerator.IsAltDown()) {
HandleButtonPressed(edit_button_);
return true;
}
if (key_code == ui::VKEY_R && accelerator.IsAltDown()) {
HandleButtonPressed(remove_button_);
return true;
}
if (key_code == ui::VKEY_ESCAPE) {
remove_bookmark_ = newly_bookmarked_; remove_bookmark_ = newly_bookmarked_;
apply_edits_ = false; apply_edits_ = false;
} }
...@@ -251,6 +258,8 @@ void BookmarkBubbleView::Init() { ...@@ -251,6 +258,8 @@ void BookmarkBubbleView::Init() {
} }
AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE)); 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( BookmarkBubbleView::BookmarkBubbleView(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment