Refactor NotificationPlatformBridgeLinux

chrome/browser/notifications/native_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_NATIVE_NOTIFICATION_DISPLAY_SERVICE_H_
 #define CHROME_BROWSER_NOTIFICATIONS_NATIVE_NOTIFICATION_DISPLAY_SERVICE_H_
 
 #include <map>
 #include <memory>
+#include <queue>
 #include <set>
 #include <string>
 
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/notifications/notification_common.h"
 #include "chrome/browser/notifications/notification_display_service.h"
 
 namespace base {
 class NullableString16;
 }
 
+class MessageCenterDisplayService;
 class Notification;
 class NotificationHandler;
 class NotificationPlatformBridge;
 class Profile;
 
 // A class to display and interact with notifications in native notification
 // centers on platforms that support it.
 class NativeNotificationDisplayService : public NotificationDisplayService {
  public:
   NativeNotificationDisplayService(
@@ skipping 22 matching lines @@
   void AddNotificationHandler(NotificationCommon::Type notification_type,
                               std::unique_ptr<NotificationHandler> handler);
 
   // Removes an implementation added via |AddNotificationHandler|.
   void RemoveNotificationHandler(NotificationCommon::Type notification_type);
 
  private:
   NotificationHandler* GetNotificationHandler(
       NotificationCommon::Type notification_type);
 
+  // Called by |notification_bridge_| when it is finished
+  // initializing.  |success| indicates it is ready to be used.
+  void OnNotificationPlatformBridgeInitialized(bool success);
+
+  void DisplayNow(NotificationCommon::Type notification_type,
+                  const std::string& notification_id,
+                  const Notification& notification);
+  void CloseNow(NotificationCommon::Type notification_type,
+                const std::string& notification_id);
+  void GetDisplayedNow(const DisplayedNotificationsCallback& callback);

[Peter Beverloo, 2017/04/25 15:16:55]

These three methods don't exist in the .cc

[Tom (Use chromium acct), 2017/04/25 18:35:21]

Oops, removed

+
   Profile* profile_;
+
   NotificationPlatformBridge* notification_bridge_;
+  // Is |notification_bridge_| ready to be used?
+  bool notification_bridge_connected_;
+
+  // MessageCenterDisplayService to fallback on if initialization of
+  // |notification_bridge_| failed.
+  std::unique_ptr<MessageCenterDisplayService> message_center_display_service_;
+
+  // Tasks that need to be run once we have the initialization status
+  // for |notification_bridge_|.
+  std::queue<base::Closure> actions_;

[Peter Beverloo, 2017/04/25 15:16:55]

nit: base::OnceClosure

[Tom (Use chromium acct), 2017/04/25 18:35:21]

Done.

+
   std::map<NotificationCommon::Type, std::unique_ptr<NotificationHandler>>
       notification_handlers_;
 
+  base::WeakPtrFactory<NativeNotificationDisplayService> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(NativeNotificationDisplayService);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_NATIVE_NOTIFICATION_DISPLAY_SERVICE_H_