Views/Harmony: Replace layout constants in chrome/browser/ui/views/extensions.

chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.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/extensions/bookmark_app_confirmation_view.h"
 
 #include "base/callback_helpers.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
+#include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 namespace {
 
 // Minimum width of the the bubble.
 const int kMinBubbleWidth = 300;
 // Size of the icon.
 const int kIconSize = extension_misc::EXTENSION_ICON_MEDIUM;
 
@@ skipping 31 matching lines @@
       ->Show();
 }
 
 BookmarkAppConfirmationView::BookmarkAppConfirmationView(
     const WebApplicationInfo& web_app_info,
     const BrowserWindow::ShowBookmarkAppBubbleCallback& callback)
     : web_app_info_(web_app_info),
       callback_(callback),
       open_as_window_checkbox_(nullptr),
       title_tf_(nullptr) {
-  views::BoxLayout* layout = new views::BoxLayout(
-      views::BoxLayout::kHorizontal, views::kButtonHEdgeMarginNew,
-      views::kButtonHEdgeMarginNew, views::kButtonHEdgeMarginNew);
+  const int button_margin = LayoutDelegate::Get()->GetMetric(
+      LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN);
+  views::BoxLayout* layout =
+      new views::BoxLayout(views::BoxLayout::kHorizontal, button_margin,
+                           button_margin, button_margin);

[tapted, 2017/03/20 03:41:52]

The children here are not buttons :/, but I suppose in both pre- and pos-
Harmony the goal is to align with the button row of the dialog client view (it
should probably be PANEL_CONTENT_MARGIN :/..)

There's a mock at http://crbug.com/652510 but it's out of date :/

But the third argument should always have been
kUnrelatedControlLargeHorizontalSpacing


Anyway I think the right things to use here are:

DIALOG_BUTTON_MARGIN, PANEL_CONTENT_MARGIN, UNRELATED_CONTROL_HORIZONTAL_SPACING

With a comment

// Align the contents with the dialog buttons.


Using PANEL_CONTENT_MARGIN for the vertical margin will squish the dialog a bit
under non-Harmony, which will look fine. But using it for the horizontal margin
will misalign things (I think). Ideally we would use PANEL_CONTENT_MARGIN for
vertical and horizontal.

[Patti Lor, 2017/03/21 06:24:29]

Done.

   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   SetLayoutManager(layout);
 
   views::ImageView* icon_image_view = new views::ImageView();
   gfx::Size image_size(kIconSize, kIconSize);
   gfx::ImageSkia image(new WebAppInfoImageSource(kIconSize, web_app_info_),
                        image_size);
   icon_image_view->SetImageSize(image_size);
   icon_image_view->SetImage(image);
@@ skipping 73 matching lines @@
     const base::string16& new_contents) {
   DCHECK_EQ(title_tf_, sender);
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 base::string16 BookmarkAppConfirmationView::GetTrimmedTitle() const {
   base::string16 title(title_tf_->text());
   base::TrimWhitespace(title, base::TRIM_ALL, &title);
   return title;
 }