| 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 0ab93b3e5711dab3b2afa28c8c0f3f9a37d6c9c1..38432bd255fccb12d9e4c1d7dab8be018810d85c 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -1900,17 +1900,20 @@ ChromeContentBrowserClient::CheckDesktopNotificationPermission(
|
|
|
| void ChromeContentBrowserClient::ShowDesktopNotification(
|
| const content::ShowDesktopNotificationHostMsgParams& params,
|
| - RenderFrameHost* render_frame_host,
|
| + content::BrowserContext* browser_context,
|
| + int render_process_id,
|
| scoped_ptr<content::DesktopNotificationDelegate> delegate,
|
| base::Closure* cancel_callback) {
|
| #if defined(ENABLE_NOTIFICATIONS)
|
| - content::RenderProcessHost* process = render_frame_host->GetProcess();
|
| - Profile* profile = Profile::FromBrowserContext(process->GetBrowserContext());
|
| + Profile* profile = Profile::FromBrowserContext(browser_context);
|
| + DCHECK(profile);
|
| +
|
| DesktopNotificationService* service =
|
| DesktopNotificationServiceFactory::GetForProfile(profile);
|
| - service->ShowDesktopNotification(
|
| - params, render_frame_host, delegate.Pass(), cancel_callback);
|
| + DCHECK(service);
|
|
|
| + service->ShowDesktopNotification(
|
| + params, render_process_id, delegate.Pass(), cancel_callback);
|
| profile->GetHostContentSettingsMap()->UpdateLastUsage(
|
| params.origin, params.origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
|
| #else
|
|
|