views: use CalculatePreferredSize(SizeBounds) in //ash/assistant.

In order to ensure implementation consistency and avoid oversights, we
should unify CalculatePreferredSize() and GetHeightForWidth(). Replace
them with the CalculatePreferredSize(SizeBounds) overload.

Bug: 40232718
Change-Id: I4ac688522f72684f51cf4a6d3dc55fa81984a349
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5465194
Reviewed-by: Eric Sum <esum@google.com>
Commit-Queue: Weidong Liu <weidongliu@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1290683}

ash/assistant/ui/assistant_web_container_view.cc

@@ -81,7 +81,8 @@ AssistantWebContainerView::AssistantWebContainerView(
 
 AssistantWebContainerView::~AssistantWebContainerView() = default;
 
-gfx::Size AssistantWebContainerView::CalculatePreferredSize() const {
+gfx::Size AssistantWebContainerView::CalculatePreferredSize(
+    const views::SizeBounds& available_size) const {
   const int non_client_frame_view_height =
       views::GetCaptionButtonLayoutSize(
           views::CaptionButtonLayoutSize::kNonBrowserCaption)

ash/assistant/ui/assistant_web_container_view.h

@@ -41,7 +41,8 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantWebContainerView
   }
 
   // views::WidgetDelegateView:
-  gfx::Size CalculatePreferredSize() const override;
+  gfx::Size CalculatePreferredSize(
+      const views::SizeBounds& available_size) const override;
   void ChildPreferredSizeChanged(views::View* child) override;
   views::ClientView* CreateClientView(views::Widget* widget) override;
   void OnThemeChanged() override;

ash/assistant/ui/main_stage/assistant_footer_view.cc

@@ -53,7 +53,8 @@ AssistantFooterView::~AssistantFooterView() {
   AssistantState::Get()->RemoveObserver(this);
 }
 
-gfx::Size AssistantFooterView::CalculatePreferredSize() const {
+gfx::Size AssistantFooterView::CalculatePreferredSize(
+    const views::SizeBounds& available_size) const {
   return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX));
 }
 

ash/assistant/ui/main_stage/assistant_footer_view.h

@@ -38,7 +38,8 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantFooterView
   ~AssistantFooterView() override;
 
   // views::View:
-  gfx::Size CalculatePreferredSize() const override;
+  gfx::Size CalculatePreferredSize(
+      const views::SizeBounds& available_size) const override;
   int GetHeightForWidth(int width) const override;
 
   // AssistantStateObserver:

ash/assistant/ui/main_stage/assistant_onboarding_view.cc

@@ -129,7 +129,8 @@ AssistantOnboardingView::~AssistantOnboardingView() {
     AssistantSuggestionsController::Get()->GetModel()->RemoveObserver(this);
 }
 
-gfx::Size AssistantOnboardingView::CalculatePreferredSize() const {
+gfx::Size AssistantOnboardingView::CalculatePreferredSize(
+    const views::SizeBounds& available_size) const {
   return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX));
 }
 

ash/assistant/ui/main_stage/assistant_onboarding_view.h

@@ -40,7 +40,8 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantOnboardingView
   ~AssistantOnboardingView() override;
 
   // views::View:
-  gfx::Size CalculatePreferredSize() const override;
+  gfx::Size CalculatePreferredSize(
+      const views::SizeBounds& available_size) const override;
   void ChildPreferredSizeChanged(views::View* child) override;
   void OnThemeChanged() override;
 

ash/assistant/ui/main_stage/assistant_opt_in_view.cc

@@ -68,7 +68,8 @@ class AssistantOptInContainer : public views::Button {
   ~AssistantOptInContainer() override = default;
 
   // views::View:
-  gfx::Size CalculatePreferredSize() const override {
+  gfx::Size CalculatePreferredSize(
+      const views::SizeBounds& available_size) const override {
     const int preferred_width = views::View::CalculatePreferredSize().width();
     return gfx::Size(preferred_width, GetHeightForWidth(preferred_width));
   }

ash/assistant/ui/main_stage/assistant_progress_indicator.cc

@@ -78,7 +78,8 @@ AssistantProgressIndicator::AssistantProgressIndicator() {
 
 AssistantProgressIndicator::~AssistantProgressIndicator() = default;
 
-gfx::Size AssistantProgressIndicator::CalculatePreferredSize() const {
+gfx::Size AssistantProgressIndicator::CalculatePreferredSize(
+    const views::SizeBounds& available_size) const {
   const int preferred_width = views::View::CalculatePreferredSize().width();
   return gfx::Size(preferred_width, GetHeightForWidth(preferred_width));
 }

ash/assistant/ui/main_stage/assistant_progress_indicator.h

@@ -25,7 +25,8 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantProgressIndicator
   ~AssistantProgressIndicator() override;
 
   // views::View:
-  gfx::Size CalculatePreferredSize() const override;
+  gfx::Size CalculatePreferredSize(
+      const views::SizeBounds& available_size) const override;
   int GetHeightForWidth(int width) const override;
   void AddedToWidget() override;
   void RemovedFromWidget() override;

ash/assistant/ui/main_stage/assistant_query_view.cc

@@ -56,7 +56,8 @@ AssistantQueryView::AssistantQueryView() {
 
 AssistantQueryView::~AssistantQueryView() = default;
 
-gfx::Size AssistantQueryView::CalculatePreferredSize() const {
+gfx::Size AssistantQueryView::CalculatePreferredSize(
+    const views::SizeBounds& available_size) const {
   return gfx::Size(kMaxWidthDip, GetHeightForWidth(kMaxWidthDip));
 }
 

ash/assistant/ui/main_stage/assistant_query_view.h

@@ -31,7 +31,8 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantQueryView : public views::View {
   ~AssistantQueryView() override;
 
   // views::View:
-  gfx::Size CalculatePreferredSize() const override;
+  gfx::Size CalculatePreferredSize(
+      const views::SizeBounds& available_size) const override;
   int GetHeightForWidth(int width) const override;
   void OnThemeChanged() override;
 

ash/assistant/ui/main_stage/assistant_zero_state_view.cc

@@ -74,8 +74,10 @@ AssistantZeroStateView::~AssistantZeroStateView() {
     AssistantUiController::Get()->GetModel()->RemoveObserver(this);
 }
 
-gfx::Size AssistantZeroStateView::CalculatePreferredSize() const {
-  return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX));
+gfx::Size AssistantZeroStateView::CalculatePreferredSize(
+    const views::SizeBounds& available_size) const {
+  return gfx::Size(
+      INT_MAX, GetLayoutManager()->GetPreferredHeightForWidth(this, INT_MAX));
 }
 
 void AssistantZeroStateView::ChildPreferredSizeChanged(views::View* child) {

ash/assistant/ui/main_stage/assistant_zero_state_view.h

@@ -38,7 +38,8 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantZeroStateView
   ~AssistantZeroStateView() override;
 
   // views::View:
-  gfx::Size CalculatePreferredSize() const override;
+  gfx::Size CalculatePreferredSize(
+      const views::SizeBounds& available_size) const override;
   void ChildPreferredSizeChanged(views::View* child) override;
   void OnBoundsChanged(const gfx::Rect& prev_bounds) override;
 

ash/assistant/ui/main_stage/chip_view.cc

@@ -102,8 +102,10 @@ ChipView::ChipView(Type type) : type_(type) {
 
 ChipView::~ChipView() = default;
 
-gfx::Size ChipView::CalculatePreferredSize() const {
-  const int preferred_width = views::View::CalculatePreferredSize().width();
+gfx::Size ChipView::CalculatePreferredSize(
+    const views::SizeBounds& available_size) const {
+  const int preferred_width =
+      views::View::CalculatePreferredSize(available_size).width();
   return gfx::Size(preferred_width, GetHeightForWidth(preferred_width));
 }
 

ash/assistant/ui/main_stage/chip_view.h

@@ -27,7 +27,8 @@ class COMPONENT_EXPORT(ASSISTANT_UI) ChipView : public views::Button {
   ~ChipView() override;
 
   // views::View:
-  gfx::Size CalculatePreferredSize() const override;
+  gfx::Size CalculatePreferredSize(
+      const views::SizeBounds& available_size) const override;
   int GetHeightForWidth(int width) const override;
   void ChildVisibilityChanged(views::View* child) override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;