summaryrefslogtreecommitdiffstats
path: root/android_webview/browser
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-22 15:52:15 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-22 15:52:15 +0000
commit18401f99112df3d48c9fbc28b6ba401e7583ff49 (patch)
tree1160b96c2cceeb1e7f254b661e07b76bda659646 /android_webview/browser
parent3d03004eb0d8b9537579e677a7a7fcb145c279a7 (diff)
downloadchromium_src-18401f99112df3d48c9fbc28b6ba401e7583ff49.zip
chromium_src-18401f99112df3d48c9fbc28b6ba401e7583ff49.tar.gz
chromium_src-18401f99112df3d48c9fbc28b6ba401e7583ff49.tar.bz2
Remove some unnecessary NULL checks of RenderFrameHost before calling WebContents::FromRenderFrameHost.
BUG=304341 R=nasko@chromium.org Review URL: https://codereview.chromium.org/134503005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser')
-rw-r--r--android_webview/browser/aw_contents_client_bridge_base.cc1
-rw-r--r--android_webview/browser/aw_login_delegate.cc5
2 files changed, 0 insertions, 6 deletions
diff --git a/android_webview/browser/aw_contents_client_bridge_base.cc b/android_webview/browser/aw_contents_client_bridge_base.cc
index 10d2c6c..4e31f71 100644
--- a/android_webview/browser/aw_contents_client_bridge_base.cc
+++ b/android_webview/browser/aw_contents_client_bridge_base.cc
@@ -60,7 +60,6 @@ AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromID(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
content::RenderFrameHost* rfh =
content::RenderFrameHost::FromID(render_process_id, render_frame_id);
- if (!rfh) return NULL;
content::WebContents* web_contents =
content::WebContents::FromRenderFrameHost(rfh);
return UserData::GetContents(web_contents);
diff --git a/android_webview/browser/aw_login_delegate.cc b/android_webview/browser/aw_login_delegate.cc
index 5656b91..90eafbe 100644
--- a/android_webview/browser/aw_login_delegate.cc
+++ b/android_webview/browser/aw_login_delegate.cc
@@ -89,11 +89,6 @@ void AwLoginDelegate::HandleHttpAuthRequestOnUIThread(
RenderFrameHost* render_frame_host = RenderFrameHost::FromID(
render_process_id_, render_frame_id_);
- if (!render_frame_host) {
- Cancel();
- return;
- }
-
WebContents* web_contents = WebContents::FromRenderFrameHost(
render_frame_host);
if (!aw_http_auth_handler_->HandleOnUIThread(web_contents)) {