Rename GetPreferredSize to CalculatePreferredSize in ash/

ash/shell/window_type_launcher.cc

 // Copyright (c) 2012 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/shell/window_type_launcher.h"
 
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
@@ skipping 48 matching lines @@
     views::Widget* widget = views::Widget::CreateWindowWithParent(
         new ModalWindow(modal_type), parent);
     widget->GetNativeView()->SetName("ModalWindow");
     widget->Show();
   }
 
   // Overridden from views::View:
   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 {

[sky, 2017/05/22 17:30:58]

Ditto.

+    return gfx::Size(200, 200);
+  }
   void Layout() override {
     gfx::Size open_ps = open_button_->GetPreferredSize();
     gfx::Rect local_bounds = GetLocalBounds();
     open_button_->SetBounds(5, local_bounds.bottom() - open_ps.height() - 5,
                             open_ps.width(), open_ps.height());
   }
 
   // Overridden from views::WidgetDelegate:
   bool CanResize() const override { return true; }
   base::string16 GetWindowTitle() const override {
@@ skipping 38 matching lines @@
     if (non_modal_transient_->IsVisible())
       non_modal_transient_->Hide();
     else
       non_modal_transient_->Show();
   }
 
   // Overridden from views::View:
   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; }
   base::string16 GetWindowTitle() const override {
     return base::ASCIIToUTF16("Non-Modal Transient");
   }
   void DeleteDelegate() override {
     if (GetWidget() == non_modal_transient_)
       non_modal_transient_ = NULL;
 
@@ skipping 191 matching lines @@
                        MenuItemView::NORMAL);
   // MenuRunner takes ownership of root.
   menu_runner_.reset(new MenuRunner(
       root, MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU));
   menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()),
                           views::MENU_ANCHOR_TOPLEFT, source_type);
 }
 
 }  // namespace shell
 }  // namespace ash