Rename notification_id() to disambiguate its meaning

chrome/browser/notifications/message_center_notification_manager.cc

 // Copyright (c) 2012 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/message_center_notification_manager.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
@@ skipping 119 matching lines @@
   // in the given profile.
   for (NotificationMap::iterator iter = profile_notifications_.begin();
        iter != profile_notifications_.end(); ++iter) {
     ProfileNotification* old_notification = (*iter).second;
     if (old_notification->notification().replace_id() == replace_id &&
         old_notification->notification().origin_url() == origin_url &&
         old_notification->profile() == profile) {
       // Changing the type from non-progress to progress does not count towards
       // the immediate update allowed in the message center.
       std::string old_id =
-          old_notification->notification().notification_id();
+          old_notification->notification().delegate_id();
       DCHECK(message_center_->FindVisibleNotificationById(old_id));
 
       // Add/remove notification in the local list but just update the same
       // one in MessageCenter.
       delete old_notification;
       profile_notifications_.erase(old_id);
       ProfileNotification* new_notification =
           new ProfileNotification(profile, notification, message_center_);
-      profile_notifications_[notification.notification_id()] = new_notification;
+      profile_notifications_[notification.delegate_id()] = new_notification;
 
       // Now pass a copy to message center.
       scoped_ptr<message_center::Notification> message_center_notification(
           make_scoped_ptr(new message_center::Notification(notification)));
       message_center_->UpdateNotification(old_id,
                                           message_center_notification.Pass());
 
       new_notification->StartDownloads();
       return true;
     }
@@ skipping 156 matching lines @@
   // In case all downloads are synchronous, assume a pending download.
   AddPendingDownload();
 
   // Notification primary icon.
   StartDownloadWithImage(
       notification,
       &notification.icon(),
       notification.icon_url(),
       base::Bind(&message_center::MessageCenter::SetNotificationIcon,
                  base::Unretained(message_center_),
-                 notification.notification_id()));
+                 notification.delegate_id()));
 
   // Notification image.
   StartDownloadWithImage(
       notification,
       NULL,
       notification.image_url(),
       base::Bind(&message_center::MessageCenter::SetNotificationImage,
                  base::Unretained(message_center_),
-                 notification.notification_id()));
+                 notification.delegate_id()));
 
   // Notification button icons.
   StartDownloadWithImage(
       notification,
       NULL,
       notification.button_one_icon_url(),
       base::Bind(&message_center::MessageCenter::SetNotificationButtonIcon,
                  base::Unretained(message_center_),
-                 notification.notification_id(),
+                 notification.delegate_id(),
                  0));
   StartDownloadWithImage(
       notification,
       NULL,
       notification.button_two_icon_url(),
       base::Bind(&message_center::MessageCenter::SetNotificationButtonIcon,
                  base::Unretained(message_center_),
-                 notification.notification_id(),
+                 notification.delegate_id(),
                  1));
 
   // This should tell the observer we're done if everything was synchronous.
   PendingDownloadCompleted();
 }
 
 void MessageCenterNotificationManager::ImageDownloads::StartDownloadWithImage(
     const Notification& notification,
     const gfx::Image* image,
     const GURL& url,
@@ skipping 102 matching lines @@
   }
   return std::string();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private
 
 void MessageCenterNotificationManager::AddProfileNotification(
     ProfileNotification* profile_notification) {
   const Notification& notification = profile_notification->notification();
-  std::string id = notification.notification_id();
+  std::string id = notification.delegate_id();
   // Notification ids should be unique.
   DCHECK(profile_notifications_.find(id) == profile_notifications_.end());
   profile_notifications_[id] = profile_notification;
 
   // Create the copy for message center, and ensure the extension ID is correct.
   scoped_ptr<message_center::Notification> message_center_notification(
       new message_center::Notification(notification));
   message_center_->AddNotification(message_center_notification.Pass());
 
   profile_notification->StartDownloads();
 }
 
 void MessageCenterNotificationManager::RemoveProfileNotification(
     ProfileNotification* profile_notification) {
-  std::string id = profile_notification->notification().notification_id();
+  std::string id = profile_notification->notification().delegate_id();
   profile_notifications_.erase(id);
   delete profile_notification;
 }
 
 MessageCenterNotificationManager::ProfileNotification*
     MessageCenterNotificationManager::FindProfileNotification(
         const std::string& id) const {
   NotificationMap::const_iterator iter = profile_notifications_.find(id);
   if (iter == profile_notifications_.end())
     return NULL;
 
   return (*iter).second;
 }