Move message_center::CustomNotificationView to arc::ArcNotificationView

ui/arc/notification/arc_notification_view.cc

-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2017 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 "ui/arc/notification/arc_notification_view.h"
 
 #include <algorithm>
 
+#include "ui/arc/notification/arc_custom_notification_view.h"
+#include "ui/arc/notification/arc_notification_item.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/views/message_center_controller.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 {
+namespace arc {
 
 // static
-const char CustomNotificationView::kViewClassName[] = "CustomNotificationView";
+const char ArcNotificationView::kViewClassName[] = "ArcNotificationView";
 
-CustomNotificationView::CustomNotificationView(
-    MessageCenterController* controller,
-    const Notification& notification)
-    : MessageView(controller, notification) {
-  DCHECK_EQ(NOTIFICATION_TYPE_CUSTOM, notification.type());
+ArcNotificationView::ArcNotificationView(
+    std::unique_ptr<views::View> contents_view,
+    std::unique_ptr<ArcNotificationContentViewDelegate> contents_view_delegate,
+    message_center::MessageCenterController* controller,
+    const message_center::Notification& notification)
+    : message_center::MessageView(controller, notification),
+      contents_view_(contents_view.release()),

[hidehiko, 2017/05/15 13:52:16]

Please use std::move, instead, for consistency.

[yoshiki, 2017/05/15 15:48:53]

Let me double-check. |contents_view_| is a raw pointer. Is it really better to
use std::move?

[hidehiko, 2017/05/16 11:16:28]

Ah, sorry, I misunderstood.
So, the ownership is transferred to AddChildView, then, I'd recommend to use
.get() here, and use .release() in AddChildView(). So;

contents_view_(contents_view.get());
  :
{
  :
  DCHECK(contents_view_);
  AddChildView(contents_view_.release());
  :
}

[yoshiki, 2017/05/24 00:36:40]

Done. Thanks.

+      contents_view_delegate_(std::move(contents_view_delegate)) {
+  DCHECK_EQ(message_center::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());
   }
 
   focus_painter_ = views::Painter::CreateSolidFocusPainter(
-      kFocusBorderColor, gfx::Insets(0, 1, 3, 2));
+      message_center::kFocusBorderColor, gfx::Insets(0, 1, 3, 2));
 }
 
-CustomNotificationView::~CustomNotificationView() {}
+ArcNotificationView::~ArcNotificationView() = default;
 
-void CustomNotificationView::OnContentFocused() {
+void ArcNotificationView::OnContentFocused() {
   SchedulePaint();
 }
 
-void CustomNotificationView::OnContentBlured() {
+void ArcNotificationView::OnContentBlured() {
   SchedulePaint();
 }
 
-void CustomNotificationView::SetDrawBackgroundAsActive(bool active) {
+void ArcNotificationView::SetDrawBackgroundAsActive(bool active) {
   // Do nothing if |contents_view_| has a background.
   if (contents_view_->background())
     return;
 
-  MessageView::SetDrawBackgroundAsActive(active);
+  message_center::MessageView::SetDrawBackgroundAsActive(active);
 }
 
-bool CustomNotificationView::IsCloseButtonFocused() const {
+bool ArcNotificationView::IsCloseButtonFocused() const {
   if (!contents_view_delegate_)
     return false;
   return contents_view_delegate_->IsCloseButtonFocused();
 }
 
-void CustomNotificationView::RequestFocusOnCloseButton() {
+void ArcNotificationView::RequestFocusOnCloseButton() {
   if (contents_view_delegate_)
     contents_view_delegate_->RequestFocusOnCloseButton();
 }
 
-const char* CustomNotificationView::GetClassName() const {
+const char* ArcNotificationView::GetClassName() const {
   return kViewClassName;
 }
 
-void CustomNotificationView::UpdateControlButtonsVisibility() {
+void ArcNotificationView::UpdateControlButtonsVisibility() {
   if (contents_view_delegate_)
     contents_view_delegate_->UpdateControlButtonsVisibility();
 }
 
-gfx::Size CustomNotificationView::GetPreferredSize() const {
+gfx::Size ArcNotificationView::GetPreferredSize() const {
   const gfx::Insets insets = GetInsets();
-  const int contents_width = kNotificationWidth - insets.width();
+  const int contents_width =
+      message_center::kNotificationWidth - insets.width();
   const int contents_height = contents_view_->GetHeightForWidth(contents_width);
-  return gfx::Size(kNotificationWidth, contents_height + insets.height());
+  return gfx::Size(message_center::kNotificationWidth,
+                   contents_height + insets.height());
 }
 
-void CustomNotificationView::Layout() {
-  MessageView::Layout();
+void ArcNotificationView::Layout() {
+  message_center::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 {
+bool ArcNotificationView::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();
+    return message_center::MessageView::HasFocus();
 }
 
-void CustomNotificationView::RequestFocus() {
+void ArcNotificationView::RequestFocus() {
   if (contents_view_ && contents_view_->IsFocusable())
     contents_view_->RequestFocus();
   else
-    MessageView::RequestFocus();
+    message_center::MessageView::RequestFocus();
 }
 
-void CustomNotificationView::OnPaint(gfx::Canvas* canvas) {
+void ArcNotificationView::OnPaint(gfx::Canvas* canvas) {
   MessageView::OnPaint(canvas);
   if (contents_view_ && contents_view_->IsFocusable())
     views::Painter::PaintFocusPainter(contents_view_, canvas,
                                       focus_painter_.get());
 }
 
-bool CustomNotificationView::OnKeyPressed(const ui::KeyEvent& event) {
+bool ArcNotificationView::OnKeyPressed(const ui::KeyEvent& event) {
   if (contents_view_) {
     ui::InputMethod* input_method = contents_view_->GetInputMethod();
     if (input_method) {
       ui::TextInputClient* text_input_client =
           input_method->GetTextInputClient();
       if (text_input_client &&
           text_input_client->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE) {
         // If the focus is in an edit box, we skip the special key handling for
         // back space and return keys. So that these key events are sent to the
         // arc container correctly without being handled by the message center.
         return false;
       }
     }
   }
 
-  return MessageView::OnKeyPressed(event);
+  return message_center::MessageView::OnKeyPressed(event);
 }
 
-void CustomNotificationView::ChildPreferredSizeChanged(View* child) {
+void ArcNotificationView::ChildPreferredSizeChanged(View* child) {
   // Notify MessageCenterController when the custom content changes size,
   // as it may need to relayout.
   if (controller())
     controller()->UpdateNotificationSize(notification_id());
 }
 
-bool CustomNotificationView::HandleAccessibleAction(
+bool ArcNotificationView::HandleAccessibleAction(
     const ui::AXActionData& action) {
   if (contents_view_)
     return contents_view_->HandleAccessibleAction(action);
   return false;
 }
 
 }  // namespace message_center