Rename NotificationUIManagerMac to NotificationPlatformBridgeMac

chrome/browser/notifications/notification_platform_bridge_mac.mm

 // Copyright 2015 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.
 
-#include "chrome/browser/notifications/notification_ui_manager_mac.h"
+#include "chrome/browser/notifications/notification_platform_bridge_mac.h"
 
 #include <utility>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"
@@ skipping 32 matching lines @@
 NSString* const kNotificationPersistentIdKey = @"notification_persistent_id";
 
 NSString* const kNotificationProfilePersistentIdKey =
     @"notification_profile_persistent_id";
 NSString* const kNotificationIncognitoKey = @"notification_incognito";
 
 }  // namespace
 
 // static
 NotificationPlatformBridge* NotificationPlatformBridge::Create() {
-  return new NotificationUIManagerMac(
+  return new NotificationPlatformBridgeMac(
       [NSUserNotificationCenter defaultUserNotificationCenter]);
 }
 
 // A Cocoa class that represents the delegate of NSUserNotificationCenter and
 // can forward commands to C++.
 @interface NotificationCenterDelegate
     : NSObject<NSUserNotificationCenterDelegate> {
 }
 @end
 
 // /////////////////////////////////////////////////////////////////////////////
 
-NotificationUIManagerMac::NotificationUIManagerMac(
+NotificationPlatformBridgeMac::NotificationPlatformBridgeMac(
     NSUserNotificationCenter* notification_center)
     : delegate_([NotificationCenterDelegate alloc]),
       notification_center_(notification_center) {
   [notification_center_ setDelegate:delegate_.get()];
 }
 
-NotificationUIManagerMac::~NotificationUIManagerMac() {
+NotificationPlatformBridgeMac::~NotificationPlatformBridgeMac() {
   [notification_center_ setDelegate:nil];
 
   // TODO(miguelg) lift this restriction if possible.
   [notification_center_ removeAllDeliveredNotifications];
 }
 
-void NotificationUIManagerMac::Display(const std::string& notification_id,
+void NotificationPlatformBridgeMac::Display(const std::string& notification_id,
                                        const std::string& profile_id,

[Peter Beverloo, 2016/04/27 21:26:58]

nit: alignment

[Miguel Garcia, 2016/04/27 21:35:41]

Done.

                                        bool incognito,
                                        const Notification& notification) {
   base::scoped_nsobject<NSUserNotification> toast(
       [[NSUserNotification alloc] init]);
   [toast setTitle:base::SysUTF16ToNSString(notification.title())];
   [toast setSubtitle:base::SysUTF16ToNSString(notification.message())];
 
   // TODO(miguelg): try to elide the origin perhaps See NSString
   // stringWithFormat. It seems that the informativeText font is constant.
   NSString* informative_text =
@@ skipping 75 matching lines @@
 
   toast.get().userInfo = @{
     kNotificationOriginKey :
         base::SysUTF8ToNSString(notification.origin_url().spec()),
     kNotificationPersistentIdKey : base::SysUTF8ToNSString(notification_id),
     kNotificationProfilePersistentIdKey : base::SysUTF8ToNSString(profile_id),
     kNotificationIncognitoKey : [NSNumber numberWithBool:incognito]
   };
 
   [notification_center_ deliverNotification:toast];
+  notification.delegate()->Display();

[Peter Beverloo, 2016/04/27 21:26:58]

Merge conflict? You unified this in the display manager.

[Miguel Garcia, 2016/04/27 21:35:41]

mm yes I don't know how this one sneaked in. Will double check the rebase.
Thanks for spotting it!

 }
 
-void NotificationUIManagerMac::Close(const std::string& profile_id,
+void NotificationPlatformBridgeMac::Close(const std::string& profile_id,
                                      const std::string& notification_id) {

[Peter Beverloo, 2016/04/27 21:26:58]

nit: alignment

[Miguel Garcia, 2016/04/27 21:35:41]

Done.

   NSString* candidate_id = base::SysUTF8ToNSString(notification_id);
 
   NSString* current_profile_id = base::SysUTF8ToNSString(profile_id);
   for (NSUserNotification* toast in
        [notification_center_ deliveredNotifications]) {
     NSString* toast_id =
         [toast.userInfo objectForKey:kNotificationPersistentIdKey];
 
     NSString* persistent_profile_id =
         [toast.userInfo objectForKey:kNotificationProfilePersistentIdKey];
 
     if (toast_id == candidate_id &&
         persistent_profile_id == current_profile_id) {
       [notification_center_ removeDeliveredNotification:toast];
     }
   }
 }
 
-bool NotificationUIManagerMac::GetDisplayed(
+bool NotificationPlatformBridgeMac::GetDisplayed(
     const std::string& profile_id,
     bool incognito,
     std::set<std::string>* notifications) const {
   DCHECK(notifications);
   NSString* current_profile_id = base::SysUTF8ToNSString(profile_id);
   for (NSUserNotification* toast in
        [notification_center_ deliveredNotifications]) {
     NSString* toast_profile_id =
         [toast.userInfo objectForKey:kNotificationProfilePersistentIdKey];
     if (toast_profile_id == current_profile_id) {
       notifications->insert(base::SysNSStringToUTF8(
           [toast.userInfo objectForKey:kNotificationPersistentIdKey]));
     }
   }
   return true;
 }
 
-bool NotificationUIManagerMac::SupportsNotificationCenter() const {
+bool NotificationPlatformBridgeMac::SupportsNotificationCenter() const {
   return true;
 }
 
 // /////////////////////////////////////////////////////////////////////////////
 
 @implementation NotificationCenterDelegate
 - (void)userNotificationCenter:(NSUserNotificationCenter*)center
        didActivateNotification:(NSUserNotification*)notification {
   std::string notificationOrigin = base::SysNSStringToUTF8(
       [notification.userInfo objectForKey:kNotificationOriginKey]);
@@ skipping 53 matching lines @@
           persistentNotificationId.longLongValue, buttonIndex);
 }
 
 - (BOOL)userNotificationCenter:(NSUserNotificationCenter*)center
      shouldPresentNotification:(NSUserNotification*)nsNotification {
   // Always display notifications, regardless of whether the app is foreground.
   return YES;
 }
 
 @end