Added notification when user presses backspace to use new shortcut.

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 5953a8098631f2b93f929a02ce360885ef6ec670..27aaea1391ff3743eddcafeb37d9d5ce1fc75f70 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -985,12 +985,19 @@ void BrowserView::UpdateExclusiveAccessExitBubbleContent(
   if (bubble_type == EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE ||
       ShouldUseImmersiveFullscreenForUrl(url)) {
     exclusive_access_bubble_.reset();
-  } else if (exclusive_access_bubble_.get()) {
+    return;
+  }
+
+  // Hide the backspace shortcut bubble, to avoid overlapping.
+  backspace_new_shortcut_bubble_.reset();
+
+  if (exclusive_access_bubble_.get()) {

[Peter Kasting, 2016/05/19 10:08:37]

Nit: .get() not necessary

[Matt Giuca, 2016/05/23 04:22:57]

Done.

     exclusive_access_bubble_->UpdateContent(url, bubble_type);
-  } else {
-    exclusive_access_bubble_.reset(
-        new ExclusiveAccessBubbleViews(this, url, bubble_type));
+    return;
   }
+
+  exclusive_access_bubble_.reset(
+      new ExclusiveAccessBubbleViews(this, url, bubble_type));
 }
 
 void BrowserView::OnExclusiveAccessUserInput() {
@@ -1025,6 +1032,19 @@ void BrowserView::FullscreenStateChanged() {
   ProcessFullscreen(false, GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE);
 }
 
+void BrowserView::ShowBackspaceNewShortcutBubble(bool forward) {

[Peter Kasting, 2016/05/19 10:08:37]

Nit: Function definition order must match the declaration order in the .h file.

[Matt Giuca, 2016/05/23 04:22:57]

There is already significant discrepancy between the declaration order in the .h
file and the .cc file (FullscreenStateChanged and RestoreFocus are right at the
top in the .h file, but down here in the .cc file). This was my attempt at
placing the new function after all the Fullscreen logic, but I'll just move it
up after IsFullscreenBubbleVisible.

[Peter Kasting, 2016/05/24 23:35:08]

Yeah :(

I would love to see a CL that fixes all of browser_view.cc, but it would
definitely have to be separate.

+  // Hide the exclusive access bubble, to avoid overlapping.
+  exclusive_access_bubble_.reset();
+
+  if (backspace_new_shortcut_bubble_.get()) {

[Peter Kasting, 2016/05/19 10:08:37]

Nit: .get() not necessary

[Matt Giuca, 2016/05/23 04:22:57]

Done.

+    backspace_new_shortcut_bubble_->UpdateContent(forward);
+    return;
+  }
+
+  backspace_new_shortcut_bubble_.reset(
+      new BackspaceNewShortcutBubble(this, forward));
+}
+
 LocationBar* BrowserView::GetLocationBar() const {
   return GetLocationBarView();
 }