Position close buttons in bubbles based on a layout delegate constant.

ui/views/bubble/bubble_frame_view.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/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "build/build_config.h"
@@ skipping 13 matching lines @@
 #include "ui/native_theme/native_theme.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/controls/button/vector_icon_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/resources/grit/views_resources.h"
+#include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/client_view.h"
 
 namespace views {
 
 namespace {
 
 // Background color of the footnote view.
 const SkColor kFootnoteBackgroundColor = SkColorSetRGB(245, 245, 245);
 
 // Color of the top border of the footnote.
 const SkColor kFootnoteBorderColor = SkColorSetRGB(229, 229, 229);
 
-constexpr int kClosePaddingRight = 7;
-constexpr int kClosePaddingTop = 7;
-
-// The MD spec states that the center of the "x" should be 16x16 from the top
-// right of the dialog.
-constexpr int kClosePaddingRightMd = 4;
-constexpr int kClosePaddingTopMd = 4;
-
 // Get the |vertical| or horizontal amount that |available_bounds| overflows
 // |window_bounds|.
 int GetOffScreenLength(const gfx::Rect& available_bounds,
                        const gfx::Rect& window_bounds,
                        bool vertical) {
   if (available_bounds.IsEmpty() || available_bounds.Contains(window_bounds))
     return 0;
 
   //  window_bounds
   //  +---------------------------------+
@@ skipping 248 matching lines @@
   // there's no title.
   DCHECK(!title_margins_.IsEmpty() || !title_->visible());
 
   const gfx::Rect contents_bounds = GetContentsBounds();
   gfx::Rect bounds = contents_bounds;
   bounds.Inset(title_margins_);
   if (bounds.IsEmpty())
     return;
 
   // The close button is positioned somewhat closer to the edge of the bubble.
-  gfx::Point close_position = contents_bounds.top_right();
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
-    close_position += gfx::Vector2d(-close_->width() - kClosePaddingRightMd,
-                                    kClosePaddingTopMd);
-  } else {
-    close_position +=
-        gfx::Vector2d(-close_->width() - kClosePaddingRight, kClosePaddingTop);
-  }
-  close_->SetPosition(close_position);
+  const int close_margin =
+      ViewsDelegate::GetInstance()->GetDialogCloseButtonMargin();
+  close_->SetPosition(
+      gfx::Point(contents_bounds.right() - close_margin - close_->width(),
+                 contents_bounds.y() + close_margin));
 
   gfx::Size title_icon_pref_size(title_icon_->GetPreferredSize());
   int padding = 0;
   int title_height = title_icon_pref_size.height();
 
   if (title_->visible() && !title_->text().empty()) {
     if (title_icon_pref_size.width() > 0)
       padding = title_margins_.left();
 
     const int title_label_x =
@@ skipping 198 matching lines @@
   size.Enlarge(client_insets.width(), client_insets.height());
   size.SetToMax(gfx::Size(title_bar_width, 0));
 
   if (footnote_container_)
     size.Enlarge(0, footnote_container_->GetHeightForWidth(size.width()));
 
   return size;
 }
 
 }  // namespace views