Abstract notification clicks in its own dictionary

chrome/browser/ui/cocoa/notifications/notification_builder_mac.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/notifications/notification_builder_mac.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
+#include "chrome/browser/ui/cocoa/notifications/notification_constants_mac.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace {
 
 // Internal builder constants representing the different notification fields
 // They don't need to be exposed outside the builder.
 
 NSString* const kNotificationTitle = @"title";
 NSString* const kNotificationSubTitle = @"subtitle";
 NSString* const kNotificationInformativeText = @"informativeText";
 NSString* const kNotificationImage = @"icon";
 NSString* const kNotificationButtonOne = @"buttonOne";
 NSString* const kNotificationButtonTwo = @"buttonTwo";
 NSString* const kNotificationTag = @"tag";
 NSString* const kNotificationCloseButtonTag = @"closeButton";
 NSString* const kNotificationOptionsButtonTag = @"optionsButton";
 NSString* const kNotificationSettingsButtonTag = @"settingsButton";
 }  // namespace
 
-namespace notification_builder {
-
-// Exposed constants to include user related data in the notification.
-NSString* const kNotificationOrigin = @"notificationOrigin";
-NSString* const kNotificationId = @"notificationId";
-NSString* const kNotificationProfileId = @"notificationProfileId";
-NSString* const kNotificationIncognito = @"notificationIncognito";
-
-}  // namespace notification_builder
-
 @implementation NotificationBuilder {
   base::scoped_nsobject<NSMutableDictionary> notificationData_;
 }
 
 - (instancetype)init {
   if ((self = [super init])) {
     notificationData_.reset([[NSMutableDictionary alloc] init]);
     [notificationData_
         setObject:l10n_util::GetNSString(IDS_NOTIFICATION_BUTTON_CLOSE)
            forKey:kNotificationCloseButtonTag];
@@ skipping 45 matching lines @@
 }
 
 - (void)setTag:(NSString*)tag {
   if (tag.length)
     [notificationData_ setObject:tag forKey:kNotificationTag];
 }
 
 - (void)setOrigin:(NSString*)origin {
   if (origin.length)
     [notificationData_ setObject:origin
-                          forKey:notification_builder::kNotificationOrigin];
+                          forKey:notification_constants::kNotificationOrigin];
 }
 
 - (void)setNotificationId:(NSString*)notificationId {
   DCHECK(notificationId.length);
   [notificationData_ setObject:notificationId
-                        forKey:notification_builder::kNotificationId];
+                        forKey:notification_constants::kNotificationId];
 }
 
 - (void)setProfileId:(NSString*)profileId {
   DCHECK(profileId.length);
   [notificationData_ setObject:profileId
-                        forKey:notification_builder::kNotificationProfileId];
+                        forKey:notification_constants::kNotificationProfileId];
 }
 
 - (void)setIncognito:(BOOL)incognito {
   [notificationData_ setObject:[NSNumber numberWithBool:incognito]
-                        forKey:notification_builder::kNotificationIncognito];
+                        forKey:notification_constants::kNotificationIncognito];
 }
 
 - (NSUserNotification*)buildUserNotification {
   base::scoped_nsobject<NSUserNotification> toast(
       [[NSUserNotification alloc] init]);
   [toast setTitle:[notificationData_ objectForKey:kNotificationTitle]];
   [toast setSubtitle:[notificationData_ objectForKey:kNotificationSubTitle]];
   [toast setInformativeText:[notificationData_
                                 objectForKey:kNotificationInformativeText]];
 
@@ skipping 54 matching lines @@
   }
 
   // Tag
   if ([toast respondsToSelector:@selector(setIdentifier:)] &&
       [notificationData_ objectForKey:kNotificationTag]) {
     [toast setValue:[notificationData_ objectForKey:kNotificationTag]
              forKey:@"identifier"];
   }
 
   NSString* origin =
-      [notificationData_ objectForKey:notification_builder::kNotificationOrigin]
+      [notificationData_
+          objectForKey:notification_constants::kNotificationOrigin]
           ? [notificationData_
-                objectForKey:notification_builder::kNotificationOrigin]
+                objectForKey:notification_constants::kNotificationOrigin]
           : @"";
   DCHECK(
-      [notificationData_ objectForKey:notification_builder::kNotificationId]);
+      [notificationData_ objectForKey:notification_constants::kNotificationId]);
   NSString* notificationId =
-      [notificationData_ objectForKey:notification_builder::kNotificationId];
+      [notificationData_ objectForKey:notification_constants::kNotificationId];
 
   DCHECK([notificationData_
-      objectForKey:notification_builder::kNotificationProfileId]);
+      objectForKey:notification_constants::kNotificationProfileId]);
   NSString* profileId = [notificationData_
-      objectForKey:notification_builder::kNotificationProfileId];
+      objectForKey:notification_constants::kNotificationProfileId];
 
   DCHECK([notificationData_
-      objectForKey:notification_builder::kNotificationIncognito]);
+      objectForKey:notification_constants::kNotificationIncognito]);
   NSNumber* incognito = [notificationData_
-      objectForKey:notification_builder::kNotificationIncognito];
+      objectForKey:notification_constants::kNotificationIncognito];
 
   toast.get().userInfo = @{
-    notification_builder::kNotificationOrigin : origin,
-    notification_builder::kNotificationId : notificationId,
-    notification_builder::kNotificationProfileId : profileId,
-    notification_builder::kNotificationIncognito : incognito,
+    notification_constants::kNotificationOrigin : origin,
+    notification_constants::kNotificationId : notificationId,
+    notification_constants::kNotificationProfileId : profileId,
+    notification_constants::kNotificationIncognito : incognito,
   };
 
   return toast.autorelease();
 }
 
 - (NSDictionary*)buildDictionary {
   return [[notificationData_ copy] autorelease];
 }
 
 @end