Rename GetPreferredSize to CalculatePreferredSize in ash/

Also remove the function completely where it makes the code simpler:
- FrameCaptionButton
- ExitWarningWidgetDelegateView
- UserCardView

BUG=none

Review-Url: https://codereview.chromium.org/2901503003
Cr-Commit-Position: refs/heads/master@{#473715}

ash/accelerators/exit_warning_handler.cc

@@ -45,15 +45,14 @@ class ExitWarningWidgetDelegateView : public views::WidgetDelegateView {
       : text_(l10n_util::GetStringUTF16(IDS_ASH_SIGN_OUT_WARNING_POPUP_TEXT)),
         accessible_name_(l10n_util::GetStringUTF16(
             IDS_ASH_SIGN_OUT_WARNING_POPUP_TEXT_ACCESSIBLE)),
-        text_width_(0),
-        width_(0),
-        height_(0) {
+        text_width_(0) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     const gfx::FontList& font_list =
         rb.GetFontList(ui::ResourceBundle::LargeFont);
     text_width_ = gfx::GetStringWidth(text_, font_list);
-    width_ = text_width_ + kHorizontalMarginAroundText;
-    height_ = font_list.GetHeight() + kVerticalMarginAroundText;
+    set_preferred_size(
+        gfx::Size(text_width_ + kHorizontalMarginAroundText,
+                  font_list.GetHeight() + kVerticalMarginAroundText));
     views::Label* label = new views::Label();
     label->SetText(text_);
     label->SetHorizontalAlignment(gfx::ALIGN_CENTER);
@@ -66,10 +65,6 @@ class ExitWarningWidgetDelegateView : public views::WidgetDelegateView {
     SetLayoutManager(new views::FillLayout);
   }
 
-  gfx::Size GetPreferredSize() const override {
-    return gfx::Size(width_, height_);
-  }
-
   void OnPaint(gfx::Canvas* canvas) override {
     cc::PaintFlags flags;
     flags.setStyle(cc::PaintFlags::kFill_Style);
@@ -87,8 +82,6 @@ class ExitWarningWidgetDelegateView : public views::WidgetDelegateView {
   base::string16 text_;
   base::string16 accessible_name_;
   int text_width_;
-  int width_;
-  int height_;
 
   DISALLOW_COPY_AND_ASSIGN(ExitWarningWidgetDelegateView);
 };

ash/autoclick/common/autoclick_ring_handler.cc

@@ -129,7 +129,7 @@ class AutoclickRingHandler::AutoclickRingView : public views::View {
 
  private:
   // Overridden from views::View.
-  gfx::Size GetPreferredSize() const override {
+  gfx::Size CalculatePreferredSize() const override {
     return gfx::Size(2 * (kAutoclickRingOuterRadius + kAutoclickRingGlowWidth),
                      2 * (kAutoclickRingOuterRadius + kAutoclickRingGlowWidth));
   }

ash/frame/caption_buttons/frame_caption_button.cc

@@ -97,10 +97,6 @@ void FrameCaptionButton::SetAlpha(int alpha) {
   }
 }
 
-gfx::Size FrameCaptionButton::GetPreferredSize() const {
-  return size_;
-}
-
 const char* FrameCaptionButton::GetClassName() const {
   return kViewClassName;
 }

ash/frame/caption_buttons/frame_caption_button.h

@@ -47,7 +47,6 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
   void SetAlpha(int alpha);
 
   // views::View overrides:
-  gfx::Size GetPreferredSize() const override;
   const char* GetClassName() const override;
   void OnPaint(gfx::Canvas* canvas) override;
 
@@ -59,8 +58,6 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
 
   CaptionButtonIcon icon() const { return icon_; }
 
-  void set_size(const gfx::Size& size) { size_ = size; }
-
  protected:
   // views::CustomButton override:
   void OnGestureEvent(ui::GestureEvent* event) override;
@@ -73,9 +70,6 @@ class ASH_EXPORT FrameCaptionButton : public views::CustomButton {
   // The button's current icon.
   CaptionButtonIcon icon_;
 
-  // The size of the button.
-  gfx::Size size_;
-
   // Whether the button should be painted as active.
   bool paint_as_active_;
 

ash/frame/caption_buttons/frame_caption_button_container_view.cc

@@ -205,12 +205,12 @@ void FrameCaptionButtonContainerView::UpdateSizeButtonVisibility() {
 }
 
 void FrameCaptionButtonContainerView::SetButtonSize(const gfx::Size& size) {
-  minimize_button_->set_size(size);
-  size_button_->set_size(size);
-  close_button_->set_size(size);
+  minimize_button_->set_preferred_size(size);
+  size_button_->set_preferred_size(size);
+  close_button_->set_preferred_size(size);
 }
 
-gfx::Size FrameCaptionButtonContainerView::GetPreferredSize() const {
+gfx::Size FrameCaptionButtonContainerView::CalculatePreferredSize() const {
   int width = 0;
   for (int i = 0; i < child_count(); ++i) {
     const views::View* child = child_at(i);

ash/frame/caption_buttons/frame_caption_button_container_view.h

@@ -96,7 +96,7 @@ class ASH_EXPORT FrameCaptionButtonContainerView
   void SetButtonSize(const gfx::Size& size);
 
   // views::View:
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
   void Layout() override;
   const char* GetClassName() const override;
 

ash/frame/custom_frame_view_ash.cc

@@ -299,7 +299,7 @@ void CustomFrameViewAsh::ActivationChanged(bool active) {
 ////////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh, views::View overrides:
 
-gfx::Size CustomFrameViewAsh::GetPreferredSize() const {
+gfx::Size CustomFrameViewAsh::CalculatePreferredSize() const {
   gfx::Size pref = frame_->client_view()->GetPreferredSize();
   gfx::Rect bounds(0, 0, pref.width(), pref.height());
   return frame_->non_client_view()

ash/frame/custom_frame_view_ash.h

@@ -79,7 +79,7 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView {
   void ActivationChanged(bool active) override;
 
   // views::View:
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
   void Layout() override;
   const char* GetClassName() const override;
   gfx::Size GetMinimumSize() const override;

ash/magnifier/magnification_controller_unittest.cc

@@ -41,7 +41,7 @@ class TextInputView : public views::WidgetDelegateView {
 
   ~TextInputView() override {}
 
-  gfx::Size GetPreferredSize() const override {
+  gfx::Size CalculatePreferredSize() const override {
     return gfx::Size(kTextInputWindowWidth, kTextInputWindowHeight);
   }
 

ash/shelf/overflow_bubble_view.cc

@@ -95,7 +95,7 @@ void OverflowBubbleView::ScrollByYOffset(int y_offset) {
   scroll_offset_.set_y(y);
 }
 
-gfx::Size OverflowBubbleView::GetPreferredSize() const {
+gfx::Size OverflowBubbleView::CalculatePreferredSize() const {
   gfx::Size preferred_size = shelf_view_->GetPreferredSize();
 
   const gfx::Rect monitor_rect =

ash/shelf/overflow_bubble_view.h

@@ -47,7 +47,7 @@ class ASH_EXPORT OverflowBubbleView : public views::BubbleDialogDelegateView,
   void ScrollByYOffset(int y_offset);
 
   // views::View overrides:
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
   void Layout() override;
   void ChildPreferredSizeChanged(views::View* child) override;
   bool OnMouseWheel(const ui::MouseWheelEvent& event) override;

ash/shelf/shelf_tooltip_manager.cc

@@ -98,7 +98,7 @@ class ShelfTooltipManager::ShelfTooltipBubble
 
  private:
   // BubbleDialogDelegateView overrides:
-  gfx::Size GetPreferredSize() const override {
+  gfx::Size CalculatePreferredSize() const override {
     const gfx::Size size = BubbleDialogDelegateView::GetPreferredSize();
     const int kTooltipMinHeight = kTooltipHeight - 2 * kTooltipTopBottomMargin;
     return gfx::Size(std::min(size.width(), kTooltipMaxWidth),

ash/shelf/shelf_view.cc

@@ -1397,7 +1397,7 @@ int ShelfView::CancelDrag(int modified_index) {
   return modified_view ? view_model_->GetIndexOfView(modified_view) : -1;
 }
 
-gfx::Size ShelfView::GetPreferredSize() const {
+gfx::Size ShelfView::CalculatePreferredSize() const {
   gfx::Rect overflow_bounds;
   CalculateIdealBounds(&overflow_bounds);
 

ash/shelf/shelf_view.h

@@ -281,7 +281,7 @@ class ASH_EXPORT ShelfView : public views::View,
   void UpdateOverflowRange(ShelfView* overflow_view) const;
 
   // Overridden from views::View:
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   FocusTraversable* GetPaneFocusTraversable() override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;

ash/shell/lock_view.cc

@@ -33,7 +33,9 @@ class LockView : public views::WidgetDelegateView,
   ~LockView() override {}
 
   // Overridden from views::View:
-  gfx::Size GetPreferredSize() const override { return gfx::Size(500, 400); }
+  gfx::Size CalculatePreferredSize() const override {
+    return gfx::Size(500, 400);
+  }
 
  private:
   // Overridden from views::View:

ash/shell/panel_window.cc

@@ -56,7 +56,7 @@ views::Widget* PanelWindow::CreateWidget() {
   return widget;
 }
 
-gfx::Size PanelWindow::GetPreferredSize() const {
+gfx::Size PanelWindow::CalculatePreferredSize() const {
   return gfx::Size(kMinWidth, kMinHeight);
 }
 

ash/shell/panel_window.h

@@ -31,7 +31,7 @@ class PanelWindow : public views::WidgetDelegateView {
 
  private:
   // Overridden from views::View:
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
   void OnPaint(gfx::Canvas* canvas) override;
 
   // Overridden from views::WidgetDelegate:

ash/shell/widgets.cc

@@ -32,7 +32,7 @@ class WidgetsWindow : public views::WidgetDelegateView {
   // Overridden from views::View:
   void OnPaint(gfx::Canvas* canvas) override;
   void Layout() override;
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
 
   // Overridden from views::WidgetDelegate:
   base::string16 GetWindowTitle() const override;
@@ -114,7 +114,7 @@ void WidgetsWindow::Layout() {
   }
 }
 
-gfx::Size WidgetsWindow::GetPreferredSize() const {
+gfx::Size WidgetsWindow::CalculatePreferredSize() const {
   return gfx::Size(kWindowWidth, kWindowHeight);
 }
 

ash/shell/window_type_launcher.cc

@@ -66,7 +66,9 @@ class ModalWindow : public views::WidgetDelegateView,
   void OnPaint(gfx::Canvas* canvas) override {
     canvas->FillRect(GetLocalBounds(), color_);
   }
-  gfx::Size GetPreferredSize() const override { return gfx::Size(200, 200); }
+  gfx::Size CalculatePreferredSize() const override {
+    return gfx::Size(200, 200);
+  }
   void Layout() override {
     gfx::Size open_ps = open_button_->GetPreferredSize();
     gfx::Rect local_bounds = GetLocalBounds();
@@ -125,7 +127,9 @@ class NonModalTransient : public views::WidgetDelegateView {
   void OnPaint(gfx::Canvas* canvas) override {
     canvas->FillRect(GetLocalBounds(), color_);
   }
-  gfx::Size GetPreferredSize() const override { return gfx::Size(250, 250); }
+  gfx::Size CalculatePreferredSize() const override {
+    return gfx::Size(250, 250);
+  }
 
   // Overridden from views::WidgetDelegate:
   bool CanResize() const override { return true; }

ash/system/ime_menu/ime_menu_tray.cc

@@ -109,7 +109,7 @@ class ImeMenuLabel : public views::Label {
   ~ImeMenuLabel() override {}
 
   // views:Label:
-  gfx::Size GetPreferredSize() const override {
+  gfx::Size CalculatePreferredSize() const override {
     return gfx::Size(kTrayItemSize, kTrayItemSize);
   }
   int GetHeightForWidth(int width) const override { return kTrayItemSize; }

ash/system/lock_screen_action/lock_screen_action_tray.cc

@@ -43,7 +43,7 @@ class LockScreenActionTray::NewNoteActionView : public views::View {
 
   ~NewNoteActionView() override {}
 
-  gfx::Size GetPreferredSize() const override {
+  gfx::Size CalculatePreferredSize() const override {
     return gfx::Size(kItemViewPreferredSize, kItemViewPreferredSize);
   }
 

ash/system/network/network_state_list_detailed_view.cc

@@ -76,7 +76,7 @@ class NetworkStateListDetailedView::InfoBubble
 
  private:
   // View:
-  gfx::Size GetPreferredSize() const override {
+  gfx::Size CalculatePreferredSize() const override {
     // This bubble should be inset by kBubbleMargin on both left and right
     // relative to the parent bubble.
     const gfx::Size anchor_size = GetAnchorView()->size();

ash/system/tray/hover_highlight_view.cc

@@ -210,7 +210,7 @@ void HoverHighlightView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->AddIntAttribute(ui::AX_ATTR_CHECKED_STATE, checked_state);
 }
 
-gfx::Size HoverHighlightView::GetPreferredSize() const {
+gfx::Size HoverHighlightView::CalculatePreferredSize() const {
   gfx::Size size = ActionableView::GetPreferredSize();
 
   if (!expandable_ || size.height() < kTrayPopupItemMinHeight)

ash/system/tray/hover_highlight_view.h

@@ -115,7 +115,7 @@ class HoverHighlightView : public ActionableView {
   bool PerformAction(const ui::Event& event) override;
 
   // views::View:
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
   int GetHeightForWidth(int width) const override;
   void OnEnabledChanged() override;
   void OnFocus() override;

ash/system/tray/throbber_view.cc

@@ -47,7 +47,7 @@ ThrobberView::ThrobberView() {
 
 ThrobberView::~ThrobberView() {}
 
-gfx::Size ThrobberView::GetPreferredSize() const {
+gfx::Size ThrobberView::CalculatePreferredSize() const {
   return gfx::Size(kTrayPopupItemMinHeight, kTrayPopupItemMinHeight);
 }
 

ash/system/tray/throbber_view.h

@@ -42,7 +42,7 @@ class ThrobberView : public views::View {
   void SetTooltipText(const base::string16& tooltip_text);
 
   // Overriden from views::View.
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
   void Layout() override;
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override;

ash/system/tray/tray_item_view.cc

@@ -83,7 +83,7 @@ int TrayItemView::GetAnimationDurationMS() {
   return kTrayItemAnimationDurationMS;
 }
 
-gfx::Size TrayItemView::GetPreferredSize() const {
+gfx::Size TrayItemView::CalculatePreferredSize() const {
   DCHECK_EQ(1, child_count());
   gfx::Size inner_size = views::View::GetPreferredSize();
   if (image_view_)

ash/system/tray/tray_item_view.h

@@ -46,7 +46,7 @@ class ASH_EXPORT TrayItemView : public views::View,
 
   // Overridden from views::View.
   void SetVisible(bool visible) override;
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
   int GetHeightForWidth(int width) const override;
 
  protected:

ash/system/tray/tray_popup_header_button.cc

@@ -56,7 +56,7 @@ const char* TrayPopupHeaderButton::GetClassName() const {
   return kViewClassName;
 }
 
-gfx::Size TrayPopupHeaderButton::GetPreferredSize() const {
+gfx::Size TrayPopupHeaderButton::CalculatePreferredSize() const {
   return gfx::Size(kTrayPopupItemMinHeight, kTrayPopupItemMinHeight);
 }
 

ash/system/tray/tray_popup_header_button.h

@@ -31,7 +31,7 @@ class ASH_EXPORT TrayPopupHeaderButton : public views::ToggleImageButton {
  private:
   // Overridden from views::View:
   const char* GetClassName() const override;
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
 
   // Overridden from views::CustomButton:
   void StateChanged(ButtonState old_state) override;

ash/system/user/rounded_image_view.cc

@@ -43,7 +43,7 @@ void RoundedImageView::SetCornerRadii(int top_left,
   corner_radius_[3] = bottom_left;
 }
 
-gfx::Size RoundedImageView::GetPreferredSize() const {
+gfx::Size RoundedImageView::CalculatePreferredSize() const {
   return gfx::Size(image_size_.width() + GetInsets().width(),
                    image_size_.height() + GetInsets().height());
 }

ash/system/user/rounded_image_view.h

@@ -32,7 +32,7 @@ class RoundedImageView : public views::View {
                       int bottom_left);
 
   // Overridden from views::View.
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
   void OnPaint(gfx::Canvas* canvas) override;
 
   // Gets the image painted by RoundedImageView for test.

ash/system/user/user_card_view.cc

@@ -87,7 +87,6 @@ class PublicAccountUserDetails : public views::View,
  private:
   // Overridden from views::View.
   void Layout() override;
-  gfx::Size GetPreferredSize() const override;
   void OnPaint(gfx::Canvas* canvas) override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
 
@@ -101,7 +100,6 @@ class PublicAccountUserDetails : public views::View,
 
   base::string16 text_;
   views::Link* learn_more_;
-  gfx::Size preferred_size_;
   std::vector<std::unique_ptr<gfx::RenderText>> lines_;
 
   DISALLOW_COPY_AND_ASSIGN(PublicAccountUserDetails);
@@ -208,10 +206,6 @@ void PublicAccountUserDetails::Layout() {
   learn_more_->SetBoundsRect(learn_more_bounds);
 }
 
-gfx::Size PublicAccountUserDetails::GetPreferredSize() const {
-  return preferred_size_;
-}
-
 void PublicAccountUserDetails::OnPaint(gfx::Canvas* canvas) {
   for (const auto& line : lines_)
     line->Draw(canvas);
@@ -276,9 +270,9 @@ void PublicAccountUserDetails::DeterminePreferredSize() {
   const int line_height = font_list.GetHeight();
   const int link_extra_height = std::max(
       link_size.height() - learn_more_->GetInsets().top() - line_height, 0);
-  preferred_size_ =
-      gfx::Size(min_width + insets.width(),
-                line_count * line_height + link_extra_height + insets.height());
+  set_preferred_size(gfx::Size(
+      min_width + insets.width(),
+      line_count * line_height + link_extra_height + insets.height()));
 }
 
 }  // namespace

ash/system/web_notification/web_notification_tray.cc

@@ -155,7 +155,7 @@ class WebNotificationItem : public views::View, public gfx::AnimationDelegate {
 
  protected:
   // Overridden from views::View:
-  gfx::Size GetPreferredSize() const override {
+  gfx::Size CalculatePreferredSize() const override {
     if (!animation_.get() || !animation_->is_animating())
       return kTrayItemOuterSize;
 

ash/test/child_modal_window.cc

@@ -63,7 +63,7 @@ class ChildModalWindow : public views::WidgetDelegateView {
  private:
   // Overridden from View:
   void OnPaint(gfx::Canvas* canvas) override;
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
 
   // Overridden from WidgetDelegate:
   base::string16 GetWindowTitle() const override;
@@ -86,7 +86,7 @@ void ChildModalWindow::OnPaint(gfx::Canvas* canvas) {
   canvas->FillRect(GetLocalBounds(), kChildColor);
 }
 
-gfx::Size ChildModalWindow::GetPreferredSize() const {
+gfx::Size ChildModalWindow::CalculatePreferredSize() const {
   return gfx::Size(kChildWindowWidth, kChildWindowHeight);
 }
 

ash/wm/system_modal_container_layout_manager_unittest.cc

@@ -81,7 +81,9 @@ class TestWindow : public views::WidgetDelegateView {
   }
 
   // Overridden from views::View:
-  gfx::Size GetPreferredSize() const override { return gfx::Size(50, 50); }
+  gfx::Size CalculatePreferredSize() const override {
+    return gfx::Size(50, 50);
+  }
 
   // Overridden from views::WidgetDelegate:
   ui::ModalType GetModalType() const override {

ash/wm/window_cycle_list.cc

@@ -101,7 +101,7 @@ class WindowPreviewView : public views::View, public aura::WindowObserver {
   ~WindowPreviewView() override {}
 
   // views::View:
-  gfx::Size GetPreferredSize() const override {
+  gfx::Size CalculatePreferredSize() const override {
     gfx::Size size = GetSizeForPreviewArea();
     size.Enlarge(0, window_title_->GetPreferredSize().height());
     return size;
@@ -291,7 +291,7 @@ class WindowCycleView : public views::WidgetDelegateView {
   }
 
   // views::WidgetDelegateView overrides:
-  gfx::Size GetPreferredSize() const override {
+  gfx::Size CalculatePreferredSize() const override {
     return mirror_container_->GetPreferredSize();
   }
 

ash/wm/window_mirror_view.cc

@@ -42,7 +42,7 @@ WindowMirrorView::~WindowMirrorView() {
     target_->ClearProperty(aura::client::kMirroringEnabledKey);
 }
 
-gfx::Size WindowMirrorView::GetPreferredSize() const {
+gfx::Size WindowMirrorView::CalculatePreferredSize() const {
   return GetClientAreaBounds().size();
 }
 

ash/wm/window_mirror_view.h

@@ -30,7 +30,7 @@ class WindowMirrorView : public views::View {
   ~WindowMirrorView() override;
 
   // views::View:
-  gfx::Size GetPreferredSize() const override;
+  gfx::Size CalculatePreferredSize() const override;
   void Layout() override;
   bool GetNeedsNotificationWhenVisibleBoundsChange() const override;
   void OnVisibleBoundsChanged() override;

ash/wm/workspace/multi_window_resize_controller.cc

@@ -91,7 +91,7 @@ class MultiWindowResizeController::ResizeView : public views::View {
       : controller_(controller), direction_(direction) {}
 
   // views::View overrides:
-  gfx::Size GetPreferredSize() const override {
+  gfx::Size CalculatePreferredSize() const override {
     const bool vert = direction_ == LEFT_RIGHT;
     return gfx::Size(vert ? kShortSide : kLongSide,
                      vert ? kLongSide : kShortSide);