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

ui/message_center/notification_delegate.h

 // Copyright 2013 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_NOTIFICATION_DELEGATE_H_
 #define UI_MESSAGE_CENTER_NOTIFICATION_DELEGATE_H_
 
 #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"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #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 {
 
 // Delegate for a notification. This class has two roles: to implement callback
 // methods for notification, and to provide an identity of the associated
 // notification.
 class MESSAGE_CENTER_EXPORT NotificationDelegate
     : public base::RefCountedThreadSafe<NotificationDelegate> {
  public:
@@ skipping 21 matching lines @@
 
   // To be called when the user clicks the settings button in a notification.
   virtual void SettingsClick();
 
   // To be called in order to detect if a settings button should be displayed.
   virtual bool ShouldDisplaySettingsButton();
 
 #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
   // fullscreen content being displayed.
   virtual bool ShouldDisplayOverFullscreen() const;
 
  protected:
   virtual ~NotificationDelegate() {}
 
  private:
@@ skipping 38 matching lines @@
 
  private:
   ButtonClickCallback button_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(HandleNotificationButtonClickDelegate);
 };
 
 }  //  namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_NOTIFICATION_DELEGATE_H_