Transfer responsibility for providing a close button for a notification to each implementation of M…

ui/message_center/notification_delegate.h

Index: ui/message_center/notification_delegate.h
diff --git a/ui/message_center/notification_delegate.h b/ui/message_center/notification_delegate.h
index a493c18e252eb43b99572acf3347be67e88dce3e..6b1bed6715d33b2f1819e314d97ae0fedd5f2462 100644
--- a/ui/message_center/notification_delegate.h
+++ b/ui/message_center/notification_delegate.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 #include <string>
+#include <tuple>

[yoshiki, 2016/12/06 05:28:27]

Please remove this change.

[yhanada, 2016/12/06 06:41:26]

Done.

 
 #include "base/callback.h"
 #include "base/macros.h"
@@ -15,9 +16,7 @@
 #include "ui/message_center/message_center_export.h"
 
 #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-namespace views {
-class View;
-}
+#include "ui/message_center/views/custom_notification_content_view_delegate.h"
 #endif
 
 namespace message_center {
@@ -59,7 +58,7 @@ class MESSAGE_CENTER_EXPORT NotificationDelegate
 #if defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
   // To be called to construct the contents view of a popup for notifications
   // whose type is NOTIFICATION_TYPE_CUSTOM.
-  virtual std::unique_ptr<views::View> CreateCustomContent();
+  virtual std::unique_ptr<CustomContent> CreateCustomContent();
 #endif
 
   // Indicates whether this notification should be displayed when there is