In dialogs & dialog-like bubbles, make the escape button just close

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

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 39252227dfad8baa5f311c29064dd3c8bf38f9ba..c91ea3cc5162711137e44cf2bdd52586f097bcfd 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -143,10 +143,6 @@ bool BookmarkBubbleView::AcceleratorPressed(
     HandleButtonPressed(remove_button_);
     return true;
   }
-  if (key_code == ui::VKEY_ESCAPE) {

[msw, 2016/05/10 18:23:32]

This is the one case that I use myself and appreciate to some degree... If I
mistakenly hit CTRL+D (trying to hit F or C with my fat fingers), being able to
quickly press Esc to undo that action is nice. Now I'll have to tab/mouse to
press the cancel button. WDYT about keeping this behavior (and cancelling
dialogs by default?), but ensuring that Esc doesn't block permissions?

-    remove_bookmark_ = newly_bookmarked_;
-    apply_edits_ = false;
-  }
 
   return LocationBarBubbleDelegateView::AcceleratorPressed(accelerator);
 }
@@ -219,7 +215,6 @@ 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));
-  AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
 base::string16 BookmarkBubbleView::GetWindowTitle() const {
@@ -263,11 +258,11 @@ BookmarkBubbleView::BookmarkBubbleView(
       parent_model_(BookmarkModelFactory::GetForProfile(profile_),
                     BookmarkModelFactory::GetForProfile(profile_)
                         ->GetMostRecentlyAddedUserNodeForURL(url)),
-      remove_button_(NULL),
-      edit_button_(NULL),
-      close_button_(NULL),
-      title_tf_(NULL),
-      parent_combobox_(NULL),
+      remove_button_(nullptr),
+      edit_button_(nullptr),
+      close_button_(nullptr),
+      title_tf_(nullptr),
+      parent_combobox_(nullptr),
       remove_bookmark_(false),
       apply_edits_(true) {}