[AF][Status Chip] Fix PageActionIconView::UpdateBorder()

Currently it overrides the function in IconLabelBubbleViews(), but the
base class method is called in constructor, so the derived class method
is never called in this case. Calling virtual method in constructor
should be avoided.

Therefore change the function simply to a private function.

Bug: 932818
Change-Id: I790ade09db63bb4c90843722cc3a23ee5525c434
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1636288Reviewed-by: Peter Boström <pbos@chromium.org>
Commit-Queue: Siyu An <siyua@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665263}

chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

@@ -213,16 +213,6 @@ bool IconLabelBubbleView::IsBubbleShowing() const {
   return false;
 }
 
-void IconLabelBubbleView::UpdateBorder() {
-  // Bubbles are given the full internal height of the location bar so that all
-  // child views in the location bar have the same height. The visible height of
-  // the bubble should be smaller, so use an empty border to shrink down the
-  // content bounds so the background gets painted correctly.
-  SetBorder(views::CreateEmptyBorder(
-      gfx::Insets(GetLayoutConstant(LOCATION_BAR_CHILD_INTERIOR_PADDING),
-                  GetLayoutInsets(LOCATION_BAR_ICON_INTERIOR_PADDING).left())));
-}
-
 gfx::Size IconLabelBubbleView::CalculatePreferredSize() const {
   // Height will be ignored by the LocationBarView.
   return GetSizeForLabelWidth(label()->GetPreferredSize().width());
@@ -511,3 +501,13 @@ void IconLabelBubbleView::UpdateHighlightPath() {
     focus_ring()->SchedulePaint();
   }
 }
+
+void IconLabelBubbleView::UpdateBorder() {
+  // Bubbles are given the full internal height of the location bar so that all
+  // child views in the location bar have the same height. The visible height of
+  // the bubble should be smaller, so use an empty border to shrink down the
+  // content bounds so the background gets painted correctly.
+  SetBorder(views::CreateEmptyBorder(
+      gfx::Insets(GetLayoutConstant(LOCATION_BAR_CHILD_INTERIOR_PADDING),
+                  GetLayoutInsets(LOCATION_BAR_ICON_INTERIOR_PADDING).left())));
+}

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

@@ -122,9 +122,6 @@ class IconLabelBubbleView : public views::InkDropObserver,
   // prevent the bubble from reshowing on a mouse release.
   virtual bool IsBubbleShowing() const;
 
-  // Sets the border padding around this view.
-  virtual void UpdateBorder();
-
   // views::LabelButton:
   gfx::Size CalculatePreferredSize() const override;
   void Layout() override;
@@ -217,6 +214,9 @@ class IconLabelBubbleView : public views::InkDropObserver,
   // bounds and the separator visibility.
   void UpdateHighlightPath();
 
+  // Sets the border padding around this view.
+  void UpdateBorder();
+
   // The contents of the bubble.
   SeparatorView* separator_view_;
 

chrome/browser/ui/views/page_action/page_action_icon_view.cc

@@ -50,6 +50,7 @@ PageActionIconView::PageActionIconView(CommandUpdater* command_updater,
   SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
   // Only shows bubble after mouse is released.
   set_notify_action(NotifyAction::NOTIFY_ON_RELEASE);
+  UpdateBorder();
 }
 
 PageActionIconView::~PageActionIconView() {}
@@ -178,12 +179,9 @@ void PageActionIconView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
 void PageActionIconView::OnTouchUiChanged() {
   icon_size_ = GetLayoutConstant(LOCATION_BAR_ICON_SIZE);
   UpdateIconImage();
-  IconLabelBubbleView::OnTouchUiChanged();
-}
-
-void PageActionIconView::UpdateBorder() {
-  SetBorder(views::CreateEmptyBorder(
-      GetLayoutInsets(LOCATION_BAR_ICON_INTERIOR_PADDING)));
+  UpdateBorder();
+  if (GetVisible())
+    PreferredSizeChanged();
 }
 
 void PageActionIconView::SetIconColor(SkColor icon_color) {
@@ -211,3 +209,8 @@ void PageActionIconView::SetActiveInternal(bool active) {
 content::WebContents* PageActionIconView::GetWebContents() const {
   return delegate_->GetWebContentsForPageActionIconView();
 }
+
+void PageActionIconView::UpdateBorder() {
+  SetBorder(views::CreateEmptyBorder(
+      GetLayoutInsets(LOCATION_BAR_ICON_INTERIOR_PADDING)));
+}

chrome/browser/ui/views/page_action/page_action_icon_view.h

@@ -125,7 +125,6 @@ class PageActionIconView : public IconLabelBubbleView {
   // IconLabelBubbleView:
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void OnTouchUiChanged() override;
-  void UpdateBorder() override;
 
   // Updates the icon image after some state has changed.
   virtual void UpdateIconImage();
@@ -143,6 +142,8 @@ class PageActionIconView : public IconLabelBubbleView {
   Delegate* delegate() const { return delegate_; }
 
  private:
+  void UpdateBorder();
+
   // The size of the icon image (excluding the ink drop).
   int icon_size_ = GetLayoutConstant(LOCATION_BAR_ICON_SIZE);