views: add Harmony dialog width support

ui/views/window/dialog_delegate.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 "ui/views/window/dialog_delegate.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/style/platform_style.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/dialog_client_view.h"
@@ skipping 98 matching lines @@
   button->SetText(GetDialogButtonLabel(type));
   button->SetEnabled(IsDialogButtonEnabled(type));
   bool is_default = type == GetDefaultDialogButton();
   if (!PlatformStyle::kDialogDefaultButtonCanBeCancel &&
       type == ui::DIALOG_BUTTON_CANCEL) {
     is_default = false;
   }
   button->SetIsDefault(is_default);
 }
 
+DialogDelegate::DialogWidth DialogDelegate::GetDefaultDialogWidth() const {
+  return DIALOG_WIDTH_DEFAULT;
+}
+
 int DialogDelegate::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
 }
 
 int DialogDelegate::GetDefaultDialogButton() const {
   if (GetDialogButtons() & ui::DIALOG_BUTTON_OK)
     return ui::DIALOG_BUTTON_OK;
   if (GetDialogButtons() & ui::DIALOG_BUTTON_CANCEL)
     return ui::DIALOG_BUTTON_CANCEL;
   return ui::DIALOG_BUTTON_NONE;
@@ skipping 120 matching lines @@
     state->name = GetWindowTitle();
   state->role = ui::AX_ROLE_DIALOG;
 }
 
 void DialogDelegateView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this && GetWidget())
     NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
 }
 
+gfx::Size DialogDelegateView::GetPreferredSize() const {
+  int height = View::GetPreferredSize().height();

[Evan Stade, 2016/09/28 16:14:37]

you should get the width in the switch statement below, then apply
GetHeightForWidth

[Elly Fong-Jones, 2016/09/28 18:44:09]

Done.

+  DialogDelegate::DialogWidth width = DialogDelegate::DIALOG_WIDTH_DEFAULT;
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
+    width = GetDefaultDialogWidth();
+  switch (width) {
+    case DialogDelegate::DIALOG_WIDTH_SMALL: return gfx::Size(320, height);
+    case DialogDelegate::DIALOG_WIDTH_MEDIUM: return gfx::Size(448, height);
+    case DialogDelegate::DIALOG_WIDTH_LARGE: return gfx::Size(512, height);
+    default: return View::GetPreferredSize();

[Evan Stade, 2016/09/28 16:14:37]

don't we want to enforce small/medium/large? If we support anything outside this
set of three sizes, it should be the exception rather than the default.

[Evan Stade, 2016/09/28 16:14:37]

nit: better not to have a default --- explicitly list all enum values. That way
when you add a new one, the compiler will complain about an unhandled value.

[Elly Fong-Jones, 2016/09/28 18:44:09]

We do, but we can't right now, until every DialogDelegate has a
GetDefaultDialogWidth that returns a useful value. I'll add a TODO to remove the
WIDTH_DEFAULT case, though.

[Elly Fong-Jones, 2016/09/28 18:44:09]

Done.

[Evan Stade, 2016/09/28 21:12:38]

if every dialogdelegate is going to need to explicitly set this (rather than
defaulting to WIDTH_LARGE or something) we should probably not make it an
overrideable method, because that's a very verbose way to specify the width. It
would be less verbose to pass a param to the ctor or to have a setter (a la
set_margins, set_anchor_view_insets, etc.)

+  }
+  return gfx::Size();
+}
+
 }  // namespace views