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::GetDialogWidth() 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 {
+  DialogDelegate::DialogWidth width = DialogDelegate::DIALOG_WIDTH_DEFAULT;

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

maybe cleaner (especially when it comes time to remove the old way of doing
things):

if (!ui::MaterialDesignController::IsSecondaryUiMaterial() || width_factor_ ==
DIALOG_WIDTH_UNSPECIFIED)
  return View::GetPreferredSize();

// Harmony stuff

[Elly Fong-Jones, 2016/10/03 13:34:44]

Done.

+  int width_px = 0;
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
+    width = GetDialogWidth();
+  switch (width) {
+    // TODO(ellyjones): eventually remove support for DIALOG_WIDTH_DEFAULT once
+    // all DialogDelegate implementations have GetDefaultDialogWidth().
+    case DialogDelegate::DIALOG_WIDTH_DEFAULT:

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

nit: maybe DIALOG_WIDTH_UNSPECIFIED?

[Elly Fong-Jones, 2016/10/03 13:34:44]

Done.

+      return View::GetPreferredSize();
+      break;
+    case DialogDelegate::DIALOG_WIDTH_SMALL:

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

perhaps the enum should be:

enum WidthFactor {
  DIALOG_WIDTH_SMALL = 10,
  DIALOG_WIDTH_MEDIUM = 14,
  DIALOG_WIDTH_LARGE = 16,
}

then this code is pretty simple:

  int width_px = 32 * width_factor_;

[Elly Fong-Jones, 2016/10/03 13:34:44]

Oh, that's really clever! Done.

+      width_px = 320;
+      break;
+    case DialogDelegate::DIALOG_WIDTH_MEDIUM:

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

nit: don't need to qualify these constants with DialogDelegate::

[Elly Fong-Jones, 2016/10/03 13:34:44]

Done.

+      width_px = 448;
+      break;
+    case DialogDelegate::DIALOG_WIDTH_LARGE:
+      width_px = 512;
+      break;
+  }
+  return gfx::Size(width_px, GetHeightForWidth(width_px));
+}
+
 }  // namespace views