Convert location bar bubble delegates to bubble dialog delegates

ui/views/bubble/bubble_dialog_delegate.h

 // Copyright 2016 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 UI_VIEWS_BUBBLE_BUBBLE_DIALOG_DELEGATE_H_
 #define UI_VIEWS_BUBBLE_BUBBLE_DIALOG_DELEGATE_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "ui/views/bubble/bubble_border.h"
@@ skipping 12 matching lines @@
 
 // BubbleDialogDelegateView is a special DialogDelegateView for bubbles.
 class VIEWS_EXPORT BubbleDialogDelegateView : public DialogDelegateView,
                                               public WidgetObserver {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   enum class CloseReason {
     DEACTIVATION,
-    ESCAPE,
     CLOSE_BUTTON,
     UNKNOWN,
   };
 
   ~BubbleDialogDelegateView() override;
 
   // Create and initialize the bubble Widget(s) with proper bounds.
   static Widget* CreateBubble(BubbleDialogDelegateView* bubble_delegate);
 
   // WidgetDelegateView overrides:
   bool ShouldShowCloseButton() const override;
   ClientView* CreateClientView(Widget* widget) override;
   NonClientFrameView* CreateNonClientFrameView(Widget* widget) override;
   void GetAccessibleState(ui::AXViewState* state) override;
   const char* GetClassName() const override;
 
   // WidgetObserver overrides:
   void OnWidgetClosing(Widget* widget) override;
   void OnWidgetDestroying(Widget* widget) override;
   void OnWidgetVisibilityChanging(Widget* widget, bool visible) override;
   void OnWidgetVisibilityChanged(Widget* widget, bool visible) override;
   void OnWidgetActivationChanged(Widget* widget, bool active) override;
   void OnWidgetBoundsChanged(Widget* widget,
                              const gfx::Rect& new_bounds) override;
 
-  bool close_on_esc() const { return close_on_esc_; }
-  void set_close_on_esc(bool close_on_esc) { close_on_esc_ = close_on_esc; }
-
   bool close_on_deactivate() const { return close_on_deactivate_; }
   void set_close_on_deactivate(bool close) { close_on_deactivate_ = close; }
 
   View* GetAnchorView() const;
   Widget* anchor_widget() const { return anchor_widget_; }
 
   // The anchor rect is used in the absence of an assigned anchor view.
   const gfx::Rect& anchor_rect() const { return anchor_rect_; }
 
   BubbleBorder::Arrow arrow() const { return arrow_; }
@@ skipping 55 matching lines @@
   BubbleDialogDelegateView(View* anchor_view, BubbleBorder::Arrow arrow);
 
   // Get bubble bounds from the anchor rect and client view's preferred size.
   virtual gfx::Rect GetBubbleBounds();
 
   // Return a FontList to use for the title of the bubble.
   // (The default is MediumFont).
   virtual const gfx::FontList& GetTitleFontList() const;
 
   // View overrides:
-  bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
   // Perform view initialization on the contents for bubble sizing.
   virtual void Init();
 
   // Sets the anchor view or rect and repositions the bubble. Note that if a
   // valid view gets passed, the anchor rect will get ignored. If the view gets
   // deleted, but no new view gets set, the last known anchor postion will get
   // returned.
   void SetAnchorView(View* anchor_view);
@@ skipping 10 matching lines @@
 
   FRIEND_TEST_ALL_PREFIXES(BubbleDelegateTest, CreateDelegate);
   FRIEND_TEST_ALL_PREFIXES(BubbleDelegateTest, NonClientHitTest);
 
   // Update the bubble color from |theme|, unless it was explicitly set.
   void UpdateColorsFromTheme(const ui::NativeTheme* theme);
 
   // Handles widget visibility changes.
   void HandleVisibilityChanged(Widget* widget, bool visible);
 
-  // Flags controlling bubble closure on the escape key and deactivation.
-  bool close_on_esc_;
+  // A flag controlling bubble closure on deactivation.
   bool close_on_deactivate_;
 
   // The view and widget to which this bubble is anchored. Since an anchor view
   // can be deleted without notice, we store it in the ViewStorage and retrieve
   // it from there. It will make sure that the view is still valid.
   const int anchor_view_storage_id_;
   Widget* anchor_widget_;
 
   // The anchor rect used in the absence of an anchor view.
   mutable gfx::Rect anchor_rect_;
@@ skipping 26 matching lines @@
   gfx::NativeView parent_window_;
 
   CloseReason close_reason_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleDialogDelegateView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_BUBBLE_DELEGATE2_H_