Convert location bar bubble delegates to bubble dialog delegates

chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h

Index: chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h b/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h
index 13c4f7d714c68ad03940b38e6683ac80f521e75d..c9b8fa6e991832f681ca9d0aa5c345dc45791834 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h
@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_dialog_delegate.h"
 
 namespace content {
 class NotificationDetails;
@@ -19,7 +19,7 @@ class WebContents;
 // Base class for bubbles that are shown from location bar icons. The bubble
 // will automatically close when the browser transitions in or out of fullscreen
 // mode.
-class LocationBarBubbleDelegateView : public views::BubbleDelegateView,
+class LocationBarBubbleDelegateView : public views::BubbleDialogDelegateView,
                                       public content::NotificationObserver {
  public:
   enum DisplayReason {
@@ -40,6 +40,9 @@ class LocationBarBubbleDelegateView : public views::BubbleDelegateView,
   // Displays the bubble with appearance and behavior tailored for |reason|.
   void ShowForReason(DisplayReason reason);
 
+  // views::BubbleDialogDelegateView:
+  int GetDialogButtons() const override;
+
   // content::NotificationObserver:
   void Observe(int type,
                const content::NotificationSource& source,
@@ -47,7 +50,7 @@ class LocationBarBubbleDelegateView : public views::BubbleDelegateView,
 
  protected:
   // Closes the bubble.
-  virtual void Close();
+  virtual void CloseBubble();

[sky, 2016/03/09 16:18:38]

Why do you need CloseBubble()? Can't you use GetWidget()->Close()?

[Evan Stade, 2016/03/09 22:37:50]

There are some overrides, like ZoomBubbleView::CloseBubble(), which seem to
state that WidgetDelegate::OnClosing() won't work. I didn't really investigate
changing this.

 
   // If the bubble is not anchored to a view, places the bubble in the top right
   // (left in RTL) of the |screen_bounds| that contain web contents's browser