| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 918dd04f2a40139730d3867c91528d5d467fbeea..88351121395dbec9e7d3929afd7b2e85f99338d0 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -104,6 +104,7 @@
|
| #include "content/public/browser/browser_url_handler.h"
|
| #include "content/public/browser/child_process_data.h"
|
| #include "content/public/browser/child_process_security_policy.h"
|
| +#include "content/public/browser/desktop_notification_delegate.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/render_view_host.h"
|
| @@ -1883,7 +1884,7 @@ ChromeContentBrowserClient::CheckDesktopNotificationPermission(
|
| void ChromeContentBrowserClient::ShowDesktopNotification(
|
| const content::ShowDesktopNotificationHostMsgParams& params,
|
| RenderFrameHost* render_frame_host,
|
| - content::DesktopNotificationDelegate* delegate,
|
| + scoped_ptr<content::DesktopNotificationDelegate> delegate,
|
| base::Closure* cancel_callback) {
|
| #if defined(ENABLE_NOTIFICATIONS)
|
| content::RenderProcessHost* process = render_frame_host->GetProcess();
|
| @@ -1891,7 +1892,7 @@ void ChromeContentBrowserClient::ShowDesktopNotification(
|
| DesktopNotificationService* service =
|
| DesktopNotificationServiceFactory::GetForProfile(profile);
|
| service->ShowDesktopNotification(
|
| - params, render_frame_host, delegate, cancel_callback);
|
| + params, render_frame_host, delegate.Pass(), cancel_callback);
|
|
|
| profile->GetHostContentSettingsMap()->UpdateLastUsage(
|
| params.origin, params.origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
|
|
|