Convert location bar bubble delegates to bubble dialog delegates

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

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_BUBBLE_DELEGATE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_BUBBLE_DELEGATE_VIEW_H_
 
 #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;
 class NotificationSource;
 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 {
     // The bubble appears as a direct result of a user action (clicking on the
     // location bar icon).
     USER_GESTURE,
 
     // The bubble appears spontaneously over the course of the user's
     // interaction with Chrome (e.g. due to some change in the feature's
     // status).
     AUTOMATIC,
   };
 
   LocationBarBubbleDelegateView(views::View* anchor_view,
                                 content::WebContents* web_contents);
   ~LocationBarBubbleDelegateView() override;
 
   // 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,
                const content::NotificationDetails& details) override;
 
  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
   // window. Because the positioning is based on the size of the bubble, this
   // must be called after the bubble is created.
   void AdjustForFullscreen(const gfx::Rect& screen_bounds);
 
  private:
   // Used to register for fullscreen change notifications.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarBubbleDelegateView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_BUBBLE_DELEGATE_VIEW_H_