Rename ArcCustomNotificationView to ArcNotificationContentView

ui/arc/notification/arc_notification_content_view.h

 // 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.
 
-#ifndef UI_ARC_NOTIFICATION_ARC_CUSTOM_NOTIFICATION_VIEW_H_
-#define UI_ARC_NOTIFICATION_ARC_CUSTOM_NOTIFICATION_VIEW_H_
+#ifndef UI_ARC_NOTIFICATION_ARC_NOTIFICATION_CONTENT_VIEW_H_
+#define UI_ARC_NOTIFICATION_ARC_NOTIFICATION_CONTENT_VIEW_H_
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "ui/arc/notification/arc_notification_content_view_delegate.h"
 #include "ui/arc/notification/arc_notification_item.h"
 #include "ui/arc/notification/arc_notification_surface_manager.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/animation/animation_delegate.h"
@@ skipping 13 matching lines @@
 struct AXActionData;
 }
 
 namespace views {
 class FocusTraversable;
 class Widget;
 }
 
 namespace arc {
 
-// ArcCustomNotificationView is a view to host NotificationSurface and show the
+// ArcNotificationContentView is a view to host NotificationSurface and show the
 // content in itself. This is implemented as a child of ArcNotificationView.
 // TODO(yoshiki): Rename this class to ArcNotificationContentsView.

[hidehiko, 2017/05/31 03:48:38]

nit: please remove TODO.

[yoshiki, 2017/05/31 09:18:29]

Good catch. Done.

-class ArcCustomNotificationView
+class ArcNotificationContentView
     : public views::NativeViewHost,
       public views::ButtonListener,
       public aura::WindowObserver,
       public ArcNotificationItem::Observer,
       public ArcNotificationSurfaceManager::Observer,
       public gfx::AnimationDelegate {
  public:
-  explicit ArcCustomNotificationView(ArcNotificationItem* item);
-  ~ArcCustomNotificationView() override;
+  explicit ArcNotificationContentView(ArcNotificationItem* item);
+  ~ArcNotificationContentView() override;
 
   std::unique_ptr<ArcNotificationContentViewDelegate>
   CreateContentViewDelegate();
 
  private:
   class ContentViewDelegate;
   class EventForwarder;
   class SettingsButton;
   class SlideHelper;
 
   // A image button class used for the settings button and the close button.
   // We can't use forward declaration for this class due to std::unique_ptr<>
   // requires size of this class.
   class ControlButton : public message_center::PaddedButton {
    public:
-    explicit ControlButton(ArcCustomNotificationView* owner);
+    explicit ControlButton(ArcNotificationContentView* owner);
     void OnFocus() override;
     void OnBlur() override;
 
    private:
-    ArcCustomNotificationView* const owner_;
+    ArcNotificationContentView* const owner_;
 
     DISALLOW_COPY_AND_ASSIGN(ControlButton);
   };
 
   void CreateCloseButton();
   void CreateSettingsButton();
   void MaybeCreateFloatingControlButtons();
   void SetSurface(exo::NotificationSurface* surface);
   void UpdatePreferredSize();
   void UpdateControlButtonsVisibility();
@@ skipping 63 matching lines @@
 
   views::View* control_buttons_view_ = nullptr;
   std::unique_ptr<ControlButton> close_button_;
   ControlButton* settings_button_ = nullptr;
 
   // Protects from call loops between Layout and OnWindowBoundsChanged.
   bool in_layout_ = false;
 
   std::unique_ptr<gfx::LinearAnimation> control_button_color_animation_;
 
-  DISALLOW_COPY_AND_ASSIGN(ArcCustomNotificationView);
+  DISALLOW_COPY_AND_ASSIGN(ArcNotificationContentView);
 };
 
 }  // namespace arc
 
-#endif  // UI_ARC_NOTIFICATION_ARC_CUSTOM_NOTIFICATION_VIEW_H_
+#endif  // UI_ARC_NOTIFICATION_ARC_NOTIFICATION_CONTENT_VIEW_H_