diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 12:04:03 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 12:04:03 +0000 |
| commit | e4c9ef21d72897608d1ca2fb36625922d5ac4f5e (patch) | |
| tree | 1f69916dbf589e488686173808fba969d4542f82 /android_webview | |
| parent | b09b1ff981fd374712c3e47ce5ccb1a3304dbba4 (diff) | |
| download | chromium_src-e4c9ef21d72897608d1ca2fb36625922d5ac4f5e.zip chromium_src-e4c9ef21d72897608d1ca2fb36625922d5ac4f5e.tar.gz chromium_src-e4c9ef21d72897608d1ca2fb36625922d5ac4f5e.tar.bz2 | |
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
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/aw_content_browser_client.cc | 2 | ||||
| -rw-r--r-- | android_webview/browser/aw_content_browser_client.h | 2 |
2 files changed, 2 insertions, 2 deletions
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<content::DesktopNotificationDelegate> 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<content::DesktopNotificationDelegate> delegate, base::Closure* cancel_callback) OVERRIDE; virtual void RequestGeolocationPermission( content::WebContents* web_contents, |