Move handler processing to NotificationDisplayService.

chrome/browser/notifications/notification_display_service.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 CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_DISPLAY_SERVICE_H_
 #define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_DISPLAY_SERVICE_H_
 
+#include <map>
 #include <memory>
 #include <set>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "chrome/browser/notifications/notification_common.h"
 #include "components/keyed_service/core/keyed_service.h"
 
+namespace base {
+class NullableString16;
+}
+
 class Notification;
+class NotificationHandler;
 class Profile;
 
 // Profile-bound service that enables notifications to be displayed and
 // interacted with on the user's screen, orthogonal of whether this
 // functionality is provided by the browser or by the operating system. An
 // instance can be retrieved through the NotificationDisplayServiceFactory.
 //
 // TODO(peter): Add a NotificationHandler mechanism for registering listeners.
 class NotificationDisplayService : public KeyedService {
  public:
   using DisplayedNotificationsCallback =
       base::Callback<void(std::unique_ptr<std::set<std::string>>,
                           bool /* supports_synchronization */)>;
-  NotificationDisplayService() {}
-  ~NotificationDisplayService() override {}
+  explicit NotificationDisplayService(Profile* profile);
+  ~NotificationDisplayService() override;
 
   // Displays the |notification| identified by |notification_id|.
   virtual void Display(NotificationCommon::Type notification_type,
                        const std::string& notification_id,
                        const Notification& notification) = 0;
 
   // Closes the notification identified by |notification_id|.
   virtual void Close(NotificationCommon::Type notification_type,
                      const std::string& notification_id) = 0;
 
   // Writes the ids of all currently displaying notifications and
   // invokes |callback| with the result once known.
   virtual void GetDisplayed(const DisplayedNotificationsCallback& callback) = 0;
 
+  // Used to propagate back events (click, close...).

[Peter Beverloo, 2017/06/01 11:32:46]

Used by who? Now that the service has two categories of consumers it's important
to clarify that.

[Miguel Garcia, 2017/06/02 15:02:55]

Done.

+  virtual void ProcessNotificationOperation(

[Peter Beverloo, 2017/06/01 11:32:46]

Drop "virtual"?

[Miguel Garcia, 2017/06/02 15:02:55]

Done.

+      NotificationCommon::Operation operation,
+      NotificationCommon::Type notification_type,
+      const std::string& origin,
+      const std::string& notification_id,
+      int action_index,
+      const base::NullableString16& reply);
+
+ protected:
+  NotificationHandler* GetNotificationHandler(
+      NotificationCommon::Type notification_type);
+
  private:
+  // Registers an implementation object to handle notification operations
+  // for |notification_type|.
+  void AddNotificationHandler(NotificationCommon::Type notification_type,
+                              std::unique_ptr<NotificationHandler> handler);

[Peter Beverloo, 2017/06/01 11:32:46]

We'd move this to the factory, right? That'd require this method to be public.
(Fine to keep that out of this CL.)

[Miguel Garcia, 2017/06/02 15:02:55]

Yeah right now we are still adding the handlers in the constructor.

+
+  std::map<NotificationCommon::Type, std::unique_ptr<NotificationHandler>>
+      notification_handlers_;
+  Profile* profile_;
+
   DISALLOW_COPY_AND_ASSIGN(NotificationDisplayService);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_DISPLAY_SERVICE_H_