Rename GetPreferredSize to CalculatePreferredSize in ash/

ash/system/user/user_card_view.cc

 // 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.
 
 #include "ash/system/user/user_card_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
@@ skipping 69 matching lines @@
 // contains a link.
 class PublicAccountUserDetails : public views::View,
                                  public views::LinkListener {
  public:
   PublicAccountUserDetails();
   ~PublicAccountUserDetails() override;
 
  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;
 
   // Overridden from views::LinkListener.
   void LinkClicked(views::Link* source, int event_flags) override;
 
   // Calculate a preferred size that ensures the label text and the following
   // link do not wrap over more than three lines in total for aesthetic reasons
   // if possible.
   void DeterminePreferredSize();
 
   base::string16 text_;
   views::Link* learn_more_;
-  gfx::Size preferred_size_;
   std::vector<std::unique_ptr<gfx::RenderText>> lines_;
 
   DISALLOW_COPY_AND_ASSIGN(PublicAccountUserDetails);
 };
 
 PublicAccountUserDetails::PublicAccountUserDetails() : learn_more_(nullptr) {
   const int inner_padding =
       kTrayPopupPaddingHorizontal - kTrayPopupPaddingBetweenItems;
   const bool rtl = base::i18n::IsRTL();
   SetBorder(views::CreateEmptyBorder(
@@ skipping 86 matching lines @@
   position.set_y(position.y() - learn_more_->GetInsets().top());
   gfx::Rect learn_more_bounds(position, link_size);
   learn_more_bounds.Intersect(contents_area);
   if (base::i18n::IsRTL()) {
     const gfx::Insets insets = GetInsets();
     learn_more_bounds.Offset(insets.right() - insets.left(), 0);
   }
   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);
 
   views::View::OnPaint(canvas);
 }
 
 void PublicAccountUserDetails::GetAccessibleNodeData(
     ui::AXNodeData* node_data) {
   node_data->role = ui::AX_ROLE_STATIC_TEXT;
@@ skipping 44 matching lines @@
   gfx::ElideRectangleText(text_, font_list, min_width, INT_MAX,
                           gfx::TRUNCATE_LONG_WORDS, &lines);
   int line_count = lines.size();
   if (min_width - gfx::GetStringWidth(lines.back(), font_list) <=
       space_width + link_size.width()) {
     ++line_count;
   }
   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
 
 UserCardView::UserCardView(LoginStatus login_status, int user_index)
     : user_index_(user_index) {
   auto* layout = new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
                                       kTrayPopupLabelHorizontalPadding);
   SetLayoutManager(layout);
   layout->set_minimum_cross_axis_size(kTrayPopupItemMinHeight);
@@ skipping 149 matching lines @@
   media_capture_container_ = new views::View();
   media_capture_container_->SetLayoutManager(new views::FillLayout());
   media_capture_container_->AddChildView(media_capture_icon_);
   AddChildView(media_capture_container_);
 
   Shell::Get()->media_controller()->RequestCaptureState();
 }
 
 }  // namespace tray
 }  // namespace ash