Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2741043004: Revert of Add Java wrapper for RenderFrameHost (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 3568 matching lines...) Expand 10 before | Expand all | Expand 10 after
3579 3579
3580 bool WebContentsImpl::ShouldAllowRunningInsecureContent( 3580 bool WebContentsImpl::ShouldAllowRunningInsecureContent(
3581 WebContents* web_contents, 3581 WebContents* web_contents,
3582 bool allowed_per_prefs, 3582 bool allowed_per_prefs,
3583 const url::Origin& origin, 3583 const url::Origin& origin,
3584 const GURL& resource_url) { 3584 const GURL& resource_url) {
3585 return GetDelegate()->ShouldAllowRunningInsecureContent( 3585 return GetDelegate()->ShouldAllowRunningInsecureContent(
3586 web_contents, allowed_per_prefs, origin, resource_url); 3586 web_contents, allowed_per_prefs, origin, resource_url);
3587 } 3587 }
3588 3588
3589 #if defined(OS_ANDROID)
3590 base::android::ScopedJavaLocalRef<jobject>
3591 WebContentsImpl::GetJavaRenderFrameHostDelegate() {
3592 return GetJavaWebContents();
3593 }
3594 #endif
3595
3596 void WebContentsImpl::OnDidDisplayContentWithCertificateErrors( 3589 void WebContentsImpl::OnDidDisplayContentWithCertificateErrors(
3597 RenderFrameHostImpl* source, 3590 RenderFrameHostImpl* source,
3598 const GURL& url) { 3591 const GURL& url) {
3599 // TODO(nick): |url| is unused; get rid of it. 3592 // TODO(nick): |url| is unused; get rid of it.
3600 controller_.ssl_manager()->DidDisplayContentWithCertErrors(); 3593 controller_.ssl_manager()->DidDisplayContentWithCertErrors();
3601 } 3594 }
3602 3595
3603 void WebContentsImpl::OnDidRunContentWithCertificateErrors( 3596 void WebContentsImpl::OnDidRunContentWithCertificateErrors(
3604 RenderFrameHostImpl* source, 3597 RenderFrameHostImpl* source,
3605 const GURL& url) { 3598 const GURL& url) {
(...skipping 1814 matching lines...) Expand 10 before | Expand all | Expand 10 after
5420 RenderViewHost* render_view_host = RenderViewHost::From(render_widget_host); 5413 RenderViewHost* render_view_host = RenderViewHost::From(render_widget_host);
5421 if (!render_view_host) 5414 if (!render_view_host)
5422 continue; 5415 continue;
5423 render_view_host_set.insert(render_view_host); 5416 render_view_host_set.insert(render_view_host);
5424 } 5417 }
5425 for (RenderViewHost* render_view_host : render_view_host_set) 5418 for (RenderViewHost* render_view_host : render_view_host_set)
5426 render_view_host->OnWebkitPreferencesChanged(); 5419 render_view_host->OnWebkitPreferencesChanged();
5427 } 5420 }
5428 5421
5429 } // namespace content 5422 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698