| Index: chrome/browser/notifications/desktop_notification_service.h
|
| diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h
|
| index ca71f572935e3bb6841c20a7dfbecbd2626cf105..dd5edc52f4dfb43a45567efd073b8cad219a21c5 100644
|
| --- a/chrome/browser/notifications/desktop_notification_service.h
|
| +++ b/chrome/browser/notifications/desktop_notification_service.h
|
| @@ -36,7 +36,6 @@ class Profile;
|
|
|
| namespace content {
|
| class DesktopNotificationDelegate;
|
| -class RenderFrameHost;
|
| struct ShowDesktopNotificationHostMsgParams;
|
| }
|
|
|
| @@ -90,7 +89,6 @@ class DesktopNotificationService
|
| // a callback which can be used to cancel the notification.
|
| void ShowDesktopNotification(
|
| const content::ShowDesktopNotificationHostMsgParams& params,
|
| - content::RenderFrameHost* render_frame_host,
|
| scoped_ptr<content::DesktopNotificationDelegate> delegate,
|
| base::Closure* cancel_callback);
|
|
|
| @@ -107,11 +105,10 @@ class DesktopNotificationService
|
| void ShowWelcomeNotificationIfNecessary(const Notification& notification);
|
|
|
| private:
|
| - // Returns a display name for an origin in the process id, to be used in
|
| - // permission infobar or on the frame of the notification toast. Different
|
| - // from the origin itself when dealing with extensions.
|
| - base::string16 DisplayNameForOriginInProcessId(const GURL& origin,
|
| - int process_id);
|
| + // Returns a display name for an origin, to be used in the permission request
|
| + // or on the frame of the notification toast. Different from the origin itself
|
| + // when dealing with extensions.
|
| + base::string16 DisplayNameForOrigin(const GURL& origin);
|
|
|
| // Called when the string list pref has been changed.
|
| void OnStringListPrefChanged(
|
|
|