views: Remove GetHeightForWidth in //a/a/u.

Because both GetHeightForWidth and CalculatePreferredSize can provide
calculation options for preferred size calculation, but in some cases we
have to calculate both. Their coexistence also leads to some
implementation differences, such as Label fully respects row height in
GetHeightForWidth, but has limited respect for row height in
CalculatePreferredSize. In fact, we can merge them through
CalculatePreferredSize(views::SizeBounds).

Now is the stage to delete the GetHeightForWidth overload.

Bug: 40232718
Change-Id: I450ae9d282ac1ccaef84541aad5d72440974acdd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5667459
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Weidong Liu <weidongliu@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1322467}

ash/assistant/ui/dialog_plate/mic_view.cc

@@ -44,11 +44,7 @@ MicView::~MicView() {
 
 gfx::Size MicView::CalculatePreferredSize(
     const views::SizeBounds& available_size) const {
-  return gfx::Size(kPreferredSizeDip, GetHeightForWidth(kPreferredSizeDip));
-}
-
-int MicView::GetHeightForWidth(int width) const {
-  return kPreferredSizeDip;
+  return gfx::Size(kPreferredSizeDip, kPreferredSizeDip);
 }
 
 void MicView::OnAssistantControllerDestroying() {

ash/assistant/ui/dialog_plate/mic_view.h

@@ -35,7 +35,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) MicView
 
   gfx::Size CalculatePreferredSize(
       const views::SizeBounds& available_size) const override;
-  int GetHeightForWidth(int width) const override;
 
   // AssistantControllerObserver:
   void OnAssistantControllerDestroying() override;

ash/assistant/ui/main_stage/assistant_footer_view.cc

@@ -55,11 +55,7 @@ AssistantFooterView::~AssistantFooterView() {
 
 gfx::Size AssistantFooterView::CalculatePreferredSize(
     const views::SizeBounds& available_size) const {
-  return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX));
-}
-
-int AssistantFooterView::GetHeightForWidth(int width) const {
-  return kPreferredHeightDip;
+  return gfx::Size(INT_MAX, kPreferredHeightDip);
 }
 
 void AssistantFooterView::InitLayout() {

ash/assistant/ui/main_stage/assistant_footer_view.h

@@ -40,7 +40,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantFooterView
   // views::View:
   gfx::Size CalculatePreferredSize(
       const views::SizeBounds& available_size) const override;
-  int GetHeightForWidth(int width) const override;
 
   // AssistantStateObserver:
   void OnAssistantConsentStatusChanged(int consent_status) override;

ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view.cc

@@ -119,8 +119,11 @@ AssistantOnboardingSuggestionView::~AssistantOnboardingSuggestionView() {
   views::InkDrop::Remove(this);
 }
 
-int AssistantOnboardingSuggestionView::GetHeightForWidth(int width) const {
-  return kPreferredHeightDip;
+gfx::Size AssistantOnboardingSuggestionView::CalculatePreferredSize(
+    const views::SizeBounds& available_size) const {
+  const int preferred_width =
+      views::Button::CalculatePreferredSize(available_size).width();
+  return gfx::Size(preferred_width, kPreferredHeightDip);
 }
 
 void AssistantOnboardingSuggestionView::ChildPreferredSizeChanged(

ash/assistant/ui/main_stage/assistant_onboarding_suggestion_view.h

@@ -42,7 +42,8 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantOnboardingSuggestionView
   ~AssistantOnboardingSuggestionView() override;
 
   // views::View:
-  int GetHeightForWidth(int width) const override;
+  gfx::Size CalculatePreferredSize(
+      const views::SizeBounds& available_size) const override;
   void AddLayerToRegion(ui::Layer* layer, views::LayerRegion region) override;
   void RemoveLayerFromRegions(ui::Layer* layer) override;
   void ChildPreferredSizeChanged(views::View* child) override;

ash/assistant/ui/main_stage/assistant_opt_in_view.cc

@@ -73,11 +73,7 @@ class AssistantOptInContainer : public views::Button {
       const views::SizeBounds& available_size) const override {
     const int preferred_width =
         views::View::CalculatePreferredSize(available_size).width();
-    return gfx::Size(preferred_width, GetHeightForWidth(preferred_width));
-  }
-
-  int GetHeightForWidth(int width) const override {
-    return kPreferredHeightDip;
+    return gfx::Size(preferred_width, kPreferredHeightDip);
   }
 
   void ChildPreferredSizeChanged(views::View* child) override {

ash/assistant/ui/main_stage/assistant_progress_indicator.cc

@@ -82,11 +82,7 @@ gfx::Size AssistantProgressIndicator::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));
-}
-
-int AssistantProgressIndicator::GetHeightForWidth(int width) const {
-  return kPreferredHeightDip;
+  return gfx::Size(preferred_width, kPreferredHeightDip);
 }
 
 void AssistantProgressIndicator::AddedToWidget() {

ash/assistant/ui/main_stage/assistant_progress_indicator.h

@@ -27,7 +27,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantProgressIndicator
   // views::View:
   gfx::Size CalculatePreferredSize(
       const views::SizeBounds& available_size) const override;
-  int GetHeightForWidth(int width) const override;
   void AddedToWidget() override;
   void RemovedFromWidget() override;
   void OnLayerOpacityChanged(ui::PropertyChangeReason reason) override;

ash/assistant/ui/main_stage/assistant_query_view.cc

@@ -58,11 +58,7 @@ AssistantQueryView::~AssistantQueryView() = default;
 
 gfx::Size AssistantQueryView::CalculatePreferredSize(
     const views::SizeBounds& available_size) const {
-  return gfx::Size(kMaxWidthDip, GetHeightForWidth(kMaxWidthDip));
-}
-
-int AssistantQueryView::GetHeightForWidth(int width) const {
-  return kHeightDip;
+  return gfx::Size(kMaxWidthDip, kHeightDip);
 }
 
 void AssistantQueryView::OnThemeChanged() {

ash/assistant/ui/main_stage/assistant_query_view.h

@@ -33,7 +33,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) AssistantQueryView : public views::View {
   // views::View:
   gfx::Size CalculatePreferredSize(
       const views::SizeBounds& available_size) const override;
-  int GetHeightForWidth(int width) const override;
   void OnThemeChanged() override;
 
   void SetQuery(const AssistantQuery& query);

ash/assistant/ui/main_stage/chip_view.cc

@@ -107,12 +107,9 @@ 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));
-}
-
-int ChipView::GetHeightForWidth(int width) const {
-  return type_ == Type::kDefault ? kPreferredHeightDipDefault
-                                 : kPreferredHeightDipLarge;
+  return gfx::Size(preferred_width, type_ == Type::kDefault
+                                        ? kPreferredHeightDipDefault
+                                        : kPreferredHeightDipLarge);
 }
 
 void ChipView::ChildVisibilityChanged(views::View* child) {

ash/assistant/ui/main_stage/chip_view.h

@@ -29,7 +29,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) ChipView : public views::Button {
   // views::View:
   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;
   void OnThemeChanged() override;

ash/assistant/ui/main_stage/suggestion_container_view.cc

@@ -124,11 +124,7 @@ SuggestionContainerView::~SuggestionContainerView() {
 
 gfx::Size SuggestionContainerView::CalculatePreferredSize(
     const views::SizeBounds& available_size) const {
-  return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX));
-}
-
-int SuggestionContainerView::GetHeightForWidth(int width) const {
-  return kPreferredHeightDip;
+  return gfx::Size(INT_MAX, kPreferredHeightDip);
 }
 
 void SuggestionContainerView::OnContentsPreferredSizeChanged(

ash/assistant/ui/main_stage/suggestion_container_view.h

@@ -47,7 +47,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) SuggestionContainerView
   // AnimatedContainerView:
   gfx::Size CalculatePreferredSize(
       const views::SizeBounds& available_size) const override;
-  int GetHeightForWidth(int width) const override;
   void OnContentsPreferredSizeChanged(views::View* content_view) override;
   void OnAssistantControllerDestroying() override;
   void OnCommittedQueryChanged(const AssistantQuery& query) override;

ash/assistant/ui/main_stage/ui_element_container_view.cc

@@ -96,11 +96,7 @@ UiElementContainerView::~UiElementContainerView() = default;
 
 gfx::Size UiElementContainerView::CalculatePreferredSize(
     const views::SizeBounds& available_size) const {
-  return gfx::Size(INT_MAX, GetHeightForWidth(INT_MAX));
-}
-
-int UiElementContainerView::GetHeightForWidth(int width) const {
-  return content_view()->GetHeightForWidth(width);
+  return gfx::Size(INT_MAX, content_view()->GetHeightForWidth(INT_MAX));
 }
 
 gfx::Size UiElementContainerView::GetMinimumSize() const {

ash/assistant/ui/main_stage/ui_element_container_view.h

@@ -43,7 +43,6 @@ class COMPONENT_EXPORT(ASSISTANT_UI) UiElementContainerView
   // AnimatedContainerView:
   gfx::Size CalculatePreferredSize(
       const views::SizeBounds& available_size) const override;
-  int GetHeightForWidth(int width) const override;
   gfx::Size GetMinimumSize() const override;
   void Layout(PassKey) override;
   void OnCommittedQueryChanged(const AssistantQuery& query) override;