Move message_center::CustomNotificationView to arc::ArcNotificationView

ui/arc/notification/arc_notification_view.h

Index: ui/arc/notification/arc_notification_view.h
diff --git a/ui/message_center/views/custom_notification_view.h b/ui/arc/notification/arc_notification_view.h
similarity index 62%
rename from ui/message_center/views/custom_notification_view.h
rename to ui/arc/notification/arc_notification_view.h
index 6cd7f83a43253832ef8088591495cfeb9f0f9d92..ba69fd921ea93e17374d5734ac43e051b255b7a9 100644
--- a/ui/message_center/views/custom_notification_view.h
+++ b/ui/arc/notification/arc_notification_view.h
@@ -1,33 +1,33 @@
-// 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.
 
-#ifndef UI_MESSAGE_CENTER_VIEWS_CUSTOM_NOTIFICATION_VIEW_H_
-#define UI_MESSAGE_CENTER_VIEWS_CUSTOM_NOTIFICATION_VIEW_H_
+#ifndef UI_ARC_NOTIFICATION_ARC_NOTIFICATION_VIEW_H_
+#define UI_ARC_NOTIFICATION_ARC_NOTIFICATION_VIEW_H_
 
 #include "base/macros.h"
-#include "ui/message_center/message_center_export.h"
 #include "ui/message_center/views/message_view.h"
 
-namespace ui {
-struct AXActionData;
-}
-
 namespace views {
 class Painter;
 }
 
-namespace message_center {
+namespace arc {
+
+class ArcNotificationContentViewDelegate;
 
 // View for notification with NOTIFICATION_TYPE_CUSTOM that hosts the custom
 // content of the notification.
-class MESSAGE_CENTER_EXPORT CustomNotificationView : public MessageView {
+class ArcNotificationView : public message_center::MessageView {
  public:
   static const char kViewClassName[];
 
-  CustomNotificationView(MessageCenterController* controller,
-                         const Notification& notification);
-  ~CustomNotificationView() override;
+  ArcNotificationView(

[hidehiko, 2017/05/11 14:22:47]

Could you document the args? Specifically, |view| looks ambiguous (what's the
view here? IIUC content view?) at quick glance to me.

[yoshiki, 2017/05/12 08:42:37]

Done.

+      std::unique_ptr<views::View> view,
+      std::unique_ptr<ArcNotificationContentViewDelegate> delegate,
+      message_center::MessageCenterController* controller,
+      const message_center::Notification& notification);
+  ~ArcNotificationView() override;
 
   // These method are called by the content view when focus handling is defered
   // to the content.
@@ -52,18 +52,17 @@ class MESSAGE_CENTER_EXPORT CustomNotificationView : public MessageView {
   bool HandleAccessibleAction(const ui::AXActionData& action) override;
 
  private:
-  friend class CustomNotificationViewTest;
+  friend class ArcNotificationViewTest;
 
   // The view for the custom content. Owned by view hierarchy.
   views::View* contents_view_ = nullptr;
-  std::unique_ptr<CustomNotificationContentViewDelegate>
-      contents_view_delegate_;
+  std::unique_ptr<ArcNotificationContentViewDelegate> contents_view_delegate_;
 
   std::unique_ptr<views::Painter> focus_painter_;
 
-  DISALLOW_COPY_AND_ASSIGN(CustomNotificationView);
+  DISALLOW_COPY_AND_ASSIGN(ArcNotificationView);
 };
 
-}  // namespace message_center
+}  // namespace arc
 
-#endif  // UI_MESSAGE_CENTER_VIEWS_CUSTOM_NOTIFICATION_VIEW_H_
+#endif  // UI_ARC_NOTIFICATION_ARC_NOTIFICATION_VIEW_H_