Add shadow/corner radius to notifications (toasts and in-center).

ui/message_center/views/message_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/message_center/views/message_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/shadow_util.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/views/message_center_controller.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
+#include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/painter.h"
-#include "ui/views/shadow_border.h"
 
 namespace {
 
-constexpr int kShadowOffset = 1;
-constexpr int kShadowBlur = 4;
+#if defined(OS_CHROMEOS)
+const int kShadowCornerRadius = 2;
+#else
+const int kShadowCornerRadius = 0;
+#endif
+const int kShadowElevation = 2;
 
 // Creates a text for spoken feedback from the data contained in the
 // notification.
 base::string16 CreateAccessibleName(
     const message_center::Notification& notification) {
   if (!notification.accessible_name().empty())
     return notification.accessible_name();
 
   // Fall back to a text constructed from the notification.
   std::vector<base::string16> accessible_lines = {
@@ skipping 45 matching lines @@
 }
 
 void MessageView::UpdateWithNotification(const Notification& notification) {
   small_image_view_->SetImage(notification.small_image().AsImageSkia());
   display_source_ = notification.display_source();
   accessible_name_ = CreateAccessibleName(notification);
 }
 
 // static
 gfx::Insets MessageView::GetShadowInsets() {
-  return gfx::Insets(kShadowBlur / 2 - kShadowOffset,
-                     kShadowBlur / 2,
-                     kShadowBlur / 2 + kShadowOffset,
-                     kShadowBlur / 2);
+  return -gfx::ShadowValue::GetMargin(
+      gfx::ShadowDetails::Get(kShadowElevation, kShadowCornerRadius).values);
 }
 
 void MessageView::CreateShadowBorder() {
-  SetBorder(std::unique_ptr<views::Border>(new views::ShadowBorder(
-      gfx::ShadowValue(gfx::Vector2d(0, kShadowOffset), kShadowBlur,
-                       message_center::kShadowColor))));
+  const auto& shadow =
+      gfx::ShadowDetails::Get(kShadowElevation, kShadowCornerRadius);
+  gfx::Insets ninebox_insets = gfx::ShadowValue::GetBlurRegion(shadow.values) +
+                               gfx::Insets(kShadowCornerRadius);
+  SetBorder(views::CreateBorderPainter(
+      std::unique_ptr<views::Painter>(views::Painter::CreateImagePainter(

[Evan Stade, 2017/01/05 00:11:41]

see crbug.com/678371

+          shadow.ninebox_image, ninebox_insets)),
+      -gfx::ShadowValue::GetMargin(shadow.values)));
 }
 
 void MessageView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->role = ui::AX_ROLE_BUTTON;
   node_data->SetName(accessible_name_);
 }
 
 bool MessageView::OnMousePressed(const ui::MouseEvent& event) {
   if (!event.IsOnlyLeftMouseButton())
     return false;
@@ skipping 44 matching lines @@
   SlideOutView::OnBlur();
   // We paint a focus indicator.
   SchedulePaint();
 }
 
 void MessageView::Layout() {
   gfx::Rect content_bounds = GetContentsBounds();
 
   // Background.
   background_view_->SetBoundsRect(content_bounds);
+#if defined(OS_CHROMEOS)
+  // ChromeOS rounds the corners of the message view. TODO(estade): should we do
+  // this for all platforms?
+  gfx::Path path;
+  constexpr SkScalar kCornerRadius = SkIntToScalar(2);
+  path.addRoundRect(gfx::RectToSkRect(background_view_->GetLocalBounds()),
+                    kCornerRadius, kCornerRadius);
+  background_view_->set_clip_path(path);
+#endif
 
   gfx::Size small_image_size(small_image_view_->GetPreferredSize());
   gfx::Rect small_image_rect(small_image_size);
   small_image_rect.set_origin(gfx::Point(
       content_bounds.right() - small_image_size.width() - kSmallImagePadding,
       content_bounds.bottom() - small_image_size.height() -
           kSmallImagePadding));
   small_image_view_->SetBoundsRect(small_image_rect);
 }
 
@@ skipping 37 matching lines @@
 }
 
 void MessageView::SetDrawBackgroundAsActive(bool active) {
   background_view_->background()->
       SetNativeControlColor(active ? kHoveredButtonBackgroundColor :
                                      kNotificationBackgroundColor);
   SchedulePaint();
 }
 
 }  // namespace message_center