Rename notification_id() to disambiguate its meaning

chrome/browser/notifications/notification.h

 // 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.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_H_
 #define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 64 matching lines @@
   // A unique identifier used to update (replace) or remove a notification.
   const base::string16& replace_id() const { return replace_id_; }
 
   // A url for the button icons to be shown (optional).
   const GURL& button_one_icon_url() const { return button_one_icon_url_; }
   const GURL& button_two_icon_url() const { return button_two_icon_url_; }
 
   // A url for the image to be shown (optional).
   const GURL& image_url() const { return image_url_; }
 
-  std::string notification_id() const { return delegate()->id(); }
+  // Id of the delegate embedded inside this instance.
+  std::string delegate_id() const { return delegate()->id(); }
   int process_id() const { return delegate()->process_id(); }
 
   content::WebContents* GetWebContents() const {
     return delegate()->GetWebContents();
   }
   void DoneRendering() { delegate()->ReleaseRenderViewHost(); }
 
   NotificationDelegate* delegate() const { return delegate_.get(); }
 
  private:
@@ skipping 20 matching lines @@
 
   // The user-supplied replace ID for the notification.
   base::string16 replace_id_;
 
   // A proxy object that allows access back to the JavaScript object that
   // represents the notification, for firing events.
   scoped_refptr<NotificationDelegate> delegate_;
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_H_