views: implement width snapping for DialogDelegateViews

chrome/browser/ui/views/autofill/card_unmask_prompt_views.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 "chrome/browser/ui/views/autofill/card_unmask_prompt_views.h"
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 226 matching lines @@
 
   views::TooltipIcon* icon = new views::TooltipIcon(l10n_util::GetStringUTF16(
       IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_TOOLTIP));
   const int kTooltipWidth = 233;
   icon->set_bubble_width(kTooltipWidth);
   storage_row_->AddChildView(icon);
 
   return storage_row_;
 }
 
-gfx::Size CardUnmaskPromptViews::GetPreferredSize() const {
+gfx::Size CardUnmaskPromptViews::GetUnsnappedPreferredSize() const {
   // Must hardcode a width so the label knows where to wrap.

[Peter Kasting, 2017/03/30 00:35:34]

Nit: I suggest filing a followup bug on computing label preferred sizes more
like was suggested in our discussion, and adding a TODO here to fix this.

It seems like simply hardcoding a number for the entire dialog is poor in this
case anyway, as the string is not necessarily going to wrap in all (or even
most?) languages, and we should be computing something more fine-grained.

   const int kWidth = 375;
   return gfx::Size(kWidth, GetHeightForWidth(kWidth));

[Peter Kasting, 2017/03/30 00:35:34]

This line exposes a problem I didn't fully think through, and it happens in
multiple dialogs.

Let's say a dialog wants to be 330 px wide, and it computes a 200 px height for
that width.  With this CL, we'll snap the width to 448 px and return a preferred
size of (448, 200).  But this may leave a bad-looking amount of blank space at
the bottom of the dialog if GetHeightForWidth(448) would have returned something
< 200.

I think we should do something like this:

* Change GetUnsnappedPreferredSize() to GetPreferredWidth() and return an int.
* Implement DialogDelegateView::GetPreferredSize() by snapping
GetPreferredWidth() and then calling GetHeightForWidth() to compute the height.
* Ensure GetHeightForWidth() will do the Right Thing on all dialogs (it probably
already does for most).

 }
 
 void CardUnmaskPromptViews::Layout() {
   gfx::Rect contents_bounds = GetContentsBounds();
   main_contents_->SetBoundsRect(contents_bounds);
 
   // The progress overlay extends from the top of the input row
   // to the bottom of the content area.
   gfx::RectF input_rect = gfx::RectF(input_row_->GetContentsBounds());
   View::ConvertRectToTarget(input_row_, this, &input_rect);
@@ skipping 265 matching lines @@
   views::View::OnPaint(canvas);
   canvas->Restore();
 }
 
 void CardUnmaskPromptViews::FadeOutView::SetAlpha(uint8_t alpha) {
   alpha_ = alpha;
   SchedulePaint();
 }
 
 }  // namespace autofill