diff options
| author | benm <benm@chromium.org> | 2014-09-06 17:04:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-07 00:08:38 +0000 |
| commit | ad2403bd4cae2c2764097addf2caa9dfc44e9b10 (patch) | |
| tree | 5ae0e9a8ba6cf6f3c319bf57be9e38c205bb1a52 /android_webview/browser/aw_contents_client_bridge_base.cc | |
| parent | 863973350592b999dce0150ce76b3744fd34dc66 (diff) | |
| download | chromium_src-ad2403bd4cae2c2764097addf2caa9dfc44e9b10.zip chromium_src-ad2403bd4cae2c2764097addf2caa9dfc44e9b10.tar.gz chromium_src-ad2403bd4cae2c2764097addf2caa9dfc44e9b10.tar.bz2 | |
When we destroy the AwContentsClientBridge, clear the pointer to it held by webcontents user data.
Also ensure that if we don't post the callback to the java side to run the js dialog callback in the embedding app that we run the callback.
BUG=411399
Review URL: https://codereview.chromium.org/545963002
Cr-Commit-Position: refs/heads/master@{#293642}
Diffstat (limited to 'android_webview/browser/aw_contents_client_bridge_base.cc')
| -rw-r--r-- | android_webview/browser/aw_contents_client_bridge_base.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/android_webview/browser/aw_contents_client_bridge_base.cc b/android_webview/browser/aw_contents_client_bridge_base.cc index 4e31f71..ffd7160 100644 --- a/android_webview/browser/aw_contents_client_bridge_base.cc +++ b/android_webview/browser/aw_contents_client_bridge_base.cc @@ -47,6 +47,11 @@ void AwContentsClientBridgeBase::Associate( new UserData(handler)); } +void AwContentsClientBridgeBase::Disassociate( + WebContents* web_contents) { + web_contents->RemoveUserData(kAwContentsClientBridgeBase); +} + // static AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromWebContents( WebContents* web_contents) { |