Convert location bar bubble delegates to bubble dialog delegates

ui/views/window/dialog_client_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/window/dialog_client_view.h"
 
 #include <algorithm>
 
 #include "build/build_config.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 196 matching lines @@
 
   // Layout the contents view to the top and side edges of the contents bounds.
   // NOTE: The local insets do not apply to the contents view sides or top.
   const gfx::Rect contents_bounds = GetContentsBounds();
   contents_view()->SetBounds(contents_bounds.x(), contents_bounds.y(),
       contents_bounds.width(), bounds.bottom() - contents_bounds.y());
 }
 
 bool DialogClientView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   DCHECK_EQ(accelerator.key_code(), ui::VKEY_ESCAPE);
+  // Give the contents view a chance to handle it first.
+  if (contents_view()->HandlesAccelerator(accelerator) &&

[sky, 2016/03/07 21:14:31]

I dislike this because I think it's possible for the view to be called for
AcceleratorPressed twice. I say that because the ordering of targets registered
with the same accelerator depends upon the order the accelerators are added. If
the view is registered first, then it means HandleAccelerator() is called twice
for the view. It won't be detrimental, but it's a bit weird. How about a
delegate method as to whether escape should close?

[Evan Stade, 2016/03/08 01:34:44]

How about this: remove escape handling from DialogClientView and add it to
DialogDelegateView. This way subclass dialogs can override it.

See also patchset 7 for an alternative which I decided was less sensible.

+      contents_view()->AcceleratorPressed(accelerator)) {
+    return true;
+  }
+
   GetWidget()->Close();
   return true;
 }
 
 void DialogClientView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   ClientView::ViewHierarchyChanged(details);
   if (details.is_add && details.child == this) {
     UpdateDialogButtons();
     CreateExtraView();
@@ skipping 133 matching lines @@
       child_views.end());
 
   // Setup focus.
   for (size_t i = 0; i < child_views.size(); i++) {
     child_views[i]->SetNextFocusableView(
         i + 1 != child_views.size() ? child_views[i + 1] : nullptr);
   }
 }
 
 }  // namespace views