Update dialog close buttons to use vector icons and ripples.

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"
 #include "ui/base/default_style.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
+#include "ui/gfx/vector_icons_public.h"
 #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/label_button.h"
+#include "ui/views/controls/button/vector_icon_button.h"
 #include "ui/views/controls/image_view.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/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/client_view.h"
 
 namespace views {
 
@@ skipping 49 matching lines @@
   title_ = new Label(base::string16(),
                      rb.GetFontListWithDelta(ui::kTitleFontSizeDelta));
   title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title_->set_collapse_when_hidden(true);
   title_->SetVisible(false);
   title_->SetMultiLine(true);
   AddChildView(title_);
 
   close_ = CreateCloseButton(this);
   close_->SetVisible(false);
+#if defined(OS_WIN)

[sky, 2016/09/07 03:42:18]

Why do you prefer this here and not in the CreateCloseButton?

[Evan Stade, 2016/09/07 16:17:37]

because the HTCLOSE exception only makes sense in BubbleFrameView. External
users of this function will in all likelihood want a tooltip. (Probably we
shouldn't have to expose CreateCloseButton but that's how it currently stands.)

+  // Windows will automatically create a tooltip for the close button based on
+  // the HTCLOSE result from NonClientHitTest().
+  close_->SetTooltipText(base::string16());
+#endif
   AddChildView(close_);
 }
 
 BubbleFrameView::~BubbleFrameView() {}
 
 // static
-LabelButton* BubbleFrameView::CreateCloseButton(ButtonListener* listener) {
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  LabelButton* close = new LabelButton(listener, base::string16());
-  close->SetImage(CustomButton::STATE_NORMAL,
-                  *rb.GetImageNamed(IDR_CLOSE_DIALOG).ToImageSkia());
-  close->SetImage(CustomButton::STATE_HOVERED,
-                  *rb.GetImageNamed(IDR_CLOSE_DIALOG_H).ToImageSkia());
-  close->SetImage(CustomButton::STATE_PRESSED,
-                  *rb.GetImageNamed(IDR_CLOSE_DIALOG_P).ToImageSkia());
-  close->SetBorder(nullptr);
-  close->SetSize(close->GetPreferredSize());
-#if !defined(OS_WIN)
-  // Windows will automatically create a tooltip for the close button based on
-  // the HTCLOSE result from NonClientHitTest().
-  close->SetTooltipText(l10n_util::GetStringUTF16(IDS_APP_CLOSE));
-#endif
-  return close;
+Button* BubbleFrameView::CreateCloseButton(VectorIconButtonDelegate* delegate) {
+  Button* close_button = nullptr;
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+    VectorIconButton* close = new VectorIconButton(delegate);
+    close->SetIcon(gfx::VectorIconId::BAR_CLOSE);
+    close->SetSize(close->GetPreferredSize());
+    close_button = close;
+  } else {
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    LabelButton* close = new LabelButton(delegate, base::string16());
+    close->SetImage(CustomButton::STATE_NORMAL,
+                    *rb.GetImageNamed(IDR_CLOSE_DIALOG).ToImageSkia());
+    close->SetImage(CustomButton::STATE_HOVERED,
+                    *rb.GetImageNamed(IDR_CLOSE_DIALOG_H).ToImageSkia());
+    close->SetImage(CustomButton::STATE_PRESSED,
+                    *rb.GetImageNamed(IDR_CLOSE_DIALOG_P).ToImageSkia());
+    close->SetBorder(nullptr);
+    close->SetSize(close->GetPreferredSize());
+    close_button = close;
+  }
+  close_button->SetTooltipText(l10n_util::GetStringUTF16(IDS_APP_CLOSE));
+  return close_button;
 }
 
 gfx::Rect BubbleFrameView::GetBoundsForClientView() const {
   gfx::Rect client_bounds = GetContentsBounds();
   client_bounds.Inset(GetInsets());
   if (footnote_container_) {
     client_bounds.set_height(client_bounds.height() -
                              footnote_container_->height());
   }
   return client_bounds;
@@ skipping 386 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