[Mac] Add XPC alerts to GetDisplayedNotifications

chrome/browser/notifications/alert_dispatcher_mac.h

+

[Peter Beverloo, 2017/04/03 12:33:28]

revert

[Miguel Garcia, 2017/04/04 12:21:26]

Done.

 // 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_ALERT_DISPATCHER_MAC_H_
 #define CHROME_BROWSER_NOTIFICATIONS_ALERT_DISPATCHER_MAC_H_
 
 #import <Foundation/Foundation.h>
 
+#include "base/callback_forward.h"
+
+namespace {
+
+using DisplayedNotificationsCallback =

[Robert Sesek, 2017/04/03 16:51:24]

Why isn't this using NotificationDisplayService::DisplayedNotificationsCallback
?

[Miguel Garcia, 2017/04/04 12:21:26]

Do you think it's worth including the display_service here just for the
callback? they seem completly unrelated pieces otherwise.

[Robert Sesek, 2017/04/04 15:31:48]

The supports_synchronization parameter is completely meaningless in this
context, so I'd say you should either remove that from the callback or use the
type from display_service.

+    base::Callback<void(std::unique_ptr<std::set<std::string>>,
+                        bool /* supports_synchronization */)>;
+}  // namespace

[Peter Beverloo, 2017/04/03 12:33:28]

We shouldn't use anonymous namespaces in header files. Can we inline the
callback type if we can't put it as an interface member?

Alternatively, you can fake-namespace it -

  GetDisplayedMacNotificationAlertsCallback

[Miguel Garcia, 2017/04/04 12:21:26]

I went with inlining (which is a pity since I need to inline in the .mm too for
it to work)

[Robert Sesek, 2017/04/04 15:31:48]

Why can't you just declare this in the header without a namespace?

+
 // Interface to communicate with the Alert XPC service.
 @protocol AlertDispatcher<NSObject>
 
 // Deliver a notification to the XPC service to be displayed as an alert.
 - (void)dispatchNotification:(NSDictionary*)data;
 
 // Close a notification for a given |notificationId| and |profileId|.
 - (void)closeNotificationWithId:(NSString*)notificationId
                   withProfileId:(NSString*)profileId;
 
 // Close all notifications.
 - (void)closeAllNotifications;
 
+// Get currently displayed notifications.
+- (void)getDisplayedAlertsForProfileId:(NSString*)profileId
+                withNotificationCenter:
+                    (NSUserNotificationCenter*)notificationCenter
+                              callback:(DisplayedNotificationsCallback)callback;
 @end
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_ALERT_DISPATCHER_MAC_H_