From e4c9ef21d72897608d1ca2fb36625922d5ac4f5e Mon Sep 17 00:00:00 2001 From: "peter@chromium.org" Date: Tue, 5 Aug 2014 12:04:03 +0000 Subject: NotificationObjectProxy should own the DesktopNotificationDelegateImpl This makes the memory model more robust for tests (which may not interact with a notification), and means that the NotificationObjectProxy won't be stuck with a bad pointer after the delegate deletes itself. BUG= Review URL: https://codereview.chromium.org/433273002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287518 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/browser/aw_content_browser_client.cc | 2 +- android_webview/browser/aw_content_browser_client.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'android_webview') diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 000a09b..c189a38 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -406,7 +406,7 @@ blink::WebNotificationPermission void AwContentBrowserClient::ShowDesktopNotification( const content::ShowDesktopNotificationHostMsgParams& params, content::RenderFrameHost* render_frame_host, - content::DesktopNotificationDelegate* delegate, + scoped_ptr delegate, base::Closure* cancel_callback) { NOTREACHED() << "Android WebView does not support desktop notifications."; } diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h index d6b9ec5..4b6b47d 100644 --- a/android_webview/browser/aw_content_browser_client.h +++ b/android_webview/browser/aw_content_browser_client.h @@ -116,7 +116,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient { virtual void ShowDesktopNotification( const content::ShowDesktopNotificationHostMsgParams& params, content::RenderFrameHost* render_frame_host, - content::DesktopNotificationDelegate* delegate, + scoped_ptr delegate, base::Closure* cancel_callback) OVERRIDE; virtual void RequestGeolocationPermission( content::WebContents* web_contents, -- cgit v1.1