Rename GetPreferredSize to CalculatePreferredSize in ash/

ash/accelerators/exit_warning_handler.cc

 // Copyright 2013 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/accelerators/exit_warning_handler.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 27 matching lines @@
 const int kWindowCornerRadius = 2;
 const int kHorizontalMarginAroundText = 100;
 const int kVerticalMarginAroundText = 100;
 
 class ExitWarningWidgetDelegateView : public views::WidgetDelegateView {
  public:
   ExitWarningWidgetDelegateView()
       : 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);
     label->SetFontList(font_list);
     label->SetEnabledColor(kTextColor);
     label->SetDisabledColor(kTextColor);
     label->SetAutoColorReadabilityEnabled(false);
     label->SetSubpixelRenderingEnabled(false);
     AddChildView(label);
     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);
     flags.setColor(kWindowBackgroundColor);
     canvas->DrawRoundRect(GetLocalBounds(), kWindowCornerRadius, flags);
     views::WidgetDelegateView::OnPaint(canvas);
   }
 
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override {
     node_data->SetName(accessible_name_);
     node_data->role = ui::AX_ROLE_ALERT;
   }
 
  private:
   base::string16 text_;
   base::string16 accessible_name_;
   int text_width_;
-  int width_;
-  int height_;
 
   DISALLOW_COPY_AND_ASSIGN(ExitWarningWidgetDelegateView);
 };
 
 }  // namespace
 
 ExitWarningHandler::ExitWarningHandler()
     : state_(IDLE), stub_timer_for_test_(false) {}
 
 ExitWarningHandler::~ExitWarningHandler() {
@@ skipping 66 matching lines @@
   widget_->Show();
 
   delegate->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
 }
 
 void ExitWarningHandler::Hide() {
   widget_.reset();
 }
 
 }  // namespace ash