Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / bookmarks / bookmark_bubble_view.cc

diff --git a/src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index 614c947..68af4d2 100644 (file)
--- a/src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -14,11 +14,10 @@
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view_observer.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_sync_promo_view.h"
+#include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "content/public/browser/user_metrics.h"
-#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -46,9 +45,9 @@ const int kControlBorderWidth = 2;
 class UnsizedCombobox : public views::Combobox {
  public:
   explicit UnsizedCombobox(ui::ComboboxModel* model) : views::Combobox(model) {}
-  virtual ~UnsizedCombobox() {}
+  ~UnsizedCombobox() override {}
 
-  virtual gfx::Size GetPreferredSize() const OVERRIDE {
+  gfx::Size GetPreferredSize() const override {
     return gfx::Size(0, views::Combobox::GetPreferredSize().height());
   }
 
@@ -125,13 +124,20 @@ 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) {
+    HandleButtonPressed(close_button_);
+    return true;
+  }
+  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_;
     apply_edits_ = false;
   }
@@ -251,6 +257,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(