Rename GetPreferredSize to CalculatePreferredSize in ash/

ash/test/child_modal_window.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/test/child_modal_window.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
@@ skipping 45 matching lines @@
 }
 
 class ChildModalWindow : public views::WidgetDelegateView {
  public:
   ChildModalWindow();
   ~ChildModalWindow() override;
 
  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;
   bool CanResize() const override;
   ui::ModalType GetModalType() const override;
 
   DISALLOW_COPY_AND_ASSIGN(ChildModalWindow);
 };
 
 ChildModalWindow::ChildModalWindow() {
   views::Textfield* textfield = new views::Textfield;
   AddChildView(textfield);
   textfield->SetBounds(kChildTextfieldLeft, kChildTextfieldTop,
                        kChildTextfieldWidth, kChildTextfieldHeight);
 }
 
 ChildModalWindow::~ChildModalWindow() {}
 
 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);
 }
 
 base::string16 ChildModalWindow::GetWindowTitle() const {
   return base::ASCIIToUTF16("Examples: Child Modal Window");
 }
 
 bool ChildModalWindow::CanResize() const {
   return false;
 }
@@ skipping 98 matching lines @@
 
 void ChildModalParent::OnWidgetDestroying(Widget* widget) {
   if (child_) {
     DCHECK_EQ(child_, widget);
     child_ = NULL;
   }
 }
 
 }  // namespace test
 }  // namespace ash