Index: ui/arc/notification/arc_custom_notification_view.h |
diff --git a/ui/arc/notification/arc_custom_notification_view.h b/ui/arc/notification/arc_custom_notification_view.h |
index 41c5347ac83324835fc99e089db0dd49cc0f7e97..8ee10ea4a61f0cd331b90e13154d3e9782170f82 100644 |
--- a/ui/arc/notification/arc_custom_notification_view.h |
+++ b/ui/arc/notification/arc_custom_notification_view.h |
@@ -9,7 +9,7 @@ |
#include <string> |
#include "base/macros.h" |
-#include "ui/arc/notification/arc_custom_notification_item.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/message_center/views/custom_notification_content_view_delegate.h" |
@@ -32,16 +32,23 @@ class ArcCustomNotificationView |
: public views::NativeViewHost, |
public views::ButtonListener, |
public aura::WindowObserver, |
- public ArcCustomNotificationItem::Observer, |
+ public ArcNotificationItem::Observer, |
public ArcNotificationSurfaceManager::Observer { |
public: |
- explicit ArcCustomNotificationView(ArcCustomNotificationItem* item); |
+ static const char kViewClassName[]; |
hidehiko
2017/03/02 15:38:16
Could you add brief comment what this is for?
|
+ |
+ explicit ArcCustomNotificationView(ArcNotificationItem* item); |
~ArcCustomNotificationView() override; |
+ // views::View overrides: |
+ const char* GetClassName() const override; |
+ |
std::unique_ptr<message_center::CustomNotificationContentViewDelegate> |
CreateContentViewDelegate(); |
private: |
+ friend class ArcCustomNotificationViewTest; |
+ |
class ContentViewDelegate; |
class ControlButton; |
class EventForwarder; |
@@ -86,7 +93,7 @@ class ArcCustomNotificationView |
void OnNotificationSurfaceAdded(exo::NotificationSurface* surface) override; |
void OnNotificationSurfaceRemoved(exo::NotificationSurface* surface) override; |
- ArcCustomNotificationItem* item_ = nullptr; |
+ ArcNotificationItem* item_ = nullptr; |
exo::NotificationSurface* surface_ = nullptr; |
const std::string notification_key_; |