Defer focus handling to the content if it claims to have focus.

ui/message_center/views/custom_notification_view.cc

 // Copyright 2016 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/custom_notification_view.h"
 
 #include <algorithm>
 
 #include "ui/gfx/geometry/size.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
+#include "ui/views/painter.h"
 
 namespace message_center {
 
 CustomNotificationView::CustomNotificationView(
     MessageCenterController* controller,
     const Notification& notification)
     : MessageView(controller, notification) {
   DCHECK_EQ(NOTIFICATION_TYPE_CUSTOM, notification.type());
 
   auto custom_content = notification.delegate()->CreateCustomContent();
 
   contents_view_ = custom_content->view.release();
   DCHECK(contents_view_);
   AddChildView(contents_view_);
 
   contents_view_delegate_ = std::move(custom_content->delegate);
   DCHECK(contents_view_delegate_);
 
   if (contents_view_->background()) {
     background_view()->background()->SetNativeControlColor(
         contents_view_->background()->get_color());
   }
 
   AddChildView(small_image());
+
+  focus_painter_ = views::Painter::CreateSolidFocusPainter(
+      kFocusBorderColor, gfx::Insets(0, 1, 3, 2));
 }
 
 CustomNotificationView::~CustomNotificationView() {}
 
+void CustomNotificationView::OnContentFocused() {
+  SchedulePaint();
+}
+
+void CustomNotificationView::OnContentBlured() {
+  SchedulePaint();
+}
+
 void CustomNotificationView::SetDrawBackgroundAsActive(bool active) {
   // Do nothing if |contents_view_| has a background.
   if (contents_view_->background())
     return;
 
   MessageView::SetDrawBackgroundAsActive(active);
 }
 
 bool CustomNotificationView::IsCloseButtonFocused() const {
   if (!contents_view_delegate_)
@@ skipping 22 matching lines @@
   return gfx::Size(kNotificationWidth,
                    std::max(kMinContentHeight + insets.height(),
                             std::min(kMaxContentHeight + insets.height(),
                                      contents_height + insets.height())));
 }
 
 void CustomNotificationView::Layout() {
   MessageView::Layout();
 
   contents_view_->SetBoundsRect(GetContentsBounds());
+
+  // If the content view claims focus, defer focus handling to the content view.
+  if (contents_view_->IsFocusable())
+    SetFocusBehavior(FocusBehavior::NEVER);
+}
+
+bool CustomNotificationView::HasFocus() const {
+  // In case that focus handling is defered to the content view, asking the
+  // content view about focus.
+  if (contents_view_ && contents_view_->IsFocusable())
+    return contents_view_->HasFocus();
+  else
+    return MessageView::HasFocus();
+}
+
+void CustomNotificationView::RequestFocus() {
+  if (contents_view_ && contents_view_->IsFocusable())
+    contents_view_->RequestFocus();
+  else
+    MessageView::RequestFocus();
+}
+
+void CustomNotificationView::OnPaint(gfx::Canvas* canvas) {
+  MessageView::OnPaint(canvas);
+  if (contents_view_ && contents_view_->IsFocusable())
+    views::Painter::PaintFocusPainter(contents_view_, canvas,
+                                      focus_painter_.get());
 }
 
 }  // namespace message_center