Revert of BubbleFrameView: add top padding even when close button is hidden

ui/views/bubble/bubble_frame_view.h

 // 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.
 
 #ifndef UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
 #define UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/controls/button/button.h"
-#include "ui/views/controls/button/image_button.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace gfx {
 class FontList;
 }
 
 namespace views {
 
 class Label;
 class LabelButton;
 class BubbleBorder;
 class ImageView;
 
 // The non-client frame view of bubble-styled widgets.
 class VIEWS_EXPORT BubbleFrameView : public NonClientFrameView,
                                      public ButtonListener {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   BubbleFrameView(const gfx::Insets& title_margins,
                   const gfx::Insets& content_margins);
   ~BubbleFrameView() override;
 
   // Creates a close button used in the corner of the dialog.
-  static ImageButton* CreateCloseButton(ButtonListener* listener);
+  static LabelButton* CreateCloseButton(ButtonListener* listener);
 
   // NonClientFrameView overrides:
   gfx::Rect GetBoundsForClientView() const override;
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
   bool GetClientMask(const gfx::Size& size, gfx::Path* path) const override;
   int NonClientHitTest(const gfx::Point& point) override;
   void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
   void ResetWindowControls() override;
   void UpdateWindowIcon() override;
@@ skipping 29 matching lines @@
 
   // Given the size of the contents and the rect to point at, returns the bounds
   // of the bubble window. The bubble's arrow location may change if the bubble
   // does not fit on the monitor and |adjust_if_offscreen| is true.
   gfx::Rect GetUpdatedWindowBounds(const gfx::Rect& anchor_rect,
                                    gfx::Size client_size,
                                    bool adjust_if_offscreen);
 
   bool close_button_clicked() const { return close_button_clicked_; }
 
-  ImageButton* GetCloseButtonForTest() { return close_; }
+  LabelButton* GetCloseButtonForTest() { return close_; }
 
  protected:
   // Returns the available screen bounds if the frame were to show in |rect|.
   virtual gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) const;
 
   bool IsCloseButtonVisible() const;
   gfx::Rect GetCloseButtonMirroredBounds() const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewTest, GetBoundsForClientView);
@@ skipping 19 matching lines @@
 
   // Margins around the title label.
   gfx::Insets title_margins_;
 
   // Margins between the content and the inside of the border, in pixels.
   gfx::Insets content_margins_;
 
   // The optional title icon, title, and (x) close button.
   views::ImageView* title_icon_;
   Label* title_;
-  ImageButton* close_;
+  LabelButton* close_;
 
   // A view to contain the footnote view, if it exists.
   View* footnote_container_;
 
   // Whether the close button was clicked.
   bool close_button_clicked_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleFrameView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_