summaryrefslogtreecommitdiffstats
path: root/content/browser/ssl
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-28 01:33:10 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-28 01:33:10 +0000
commit6952f00643ee2d1a58177dd90f35e3542690cc87 (patch)
treee7fd1854ca634fbcce3198ee499688f545c6bbc0 /content/browser/ssl
parent5dcaf8ec918ad9caa97218b7921eb7946911248e (diff)
downloadchromium_src-6952f00643ee2d1a58177dd90f35e3542690cc87.zip
chromium_src-6952f00643ee2d1a58177dd90f35e3542690cc87.tar.gz
chromium_src-6952f00643ee2d1a58177dd90f35e3542690cc87.tar.bz2
Replace the GetAssociatedRenderView call with GetAssociatedRenderFrame in ResourceLoader and SSLClientAuthHandler.
BUG=304341 R=nasko@chromium.org Review URL: https://codereview.chromium.org/120413003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl')
-rw-r--r--content/browser/ssl/ssl_cert_error_handler.cc4
-rw-r--r--content/browser/ssl/ssl_cert_error_handler.h2
-rw-r--r--content/browser/ssl/ssl_error_handler.cc14
-rw-r--r--content/browser/ssl/ssl_error_handler.h6
-rw-r--r--content/browser/ssl/ssl_manager.cc6
-rw-r--r--content/browser/ssl/ssl_manager.h2
-rw-r--r--content/browser/ssl/ssl_policy.cc2
7 files changed, 18 insertions, 18 deletions
diff --git a/content/browser/ssl/ssl_cert_error_handler.cc b/content/browser/ssl/ssl_cert_error_handler.cc
index b3bdb41..a69e993 100644
--- a/content/browser/ssl/ssl_cert_error_handler.cc
+++ b/content/browser/ssl/ssl_cert_error_handler.cc
@@ -17,11 +17,11 @@ SSLCertErrorHandler::SSLCertErrorHandler(
ResourceType::Type resource_type,
const GURL& url,
int render_process_id,
- int render_view_id,
+ int render_frame_id,
const net::SSLInfo& ssl_info,
bool fatal)
: SSLErrorHandler(delegate, id, resource_type, url, render_process_id,
- render_view_id),
+ render_frame_id),
ssl_info_(ssl_info),
cert_error_(net::MapCertStatusToNetError(ssl_info.cert_status)),
fatal_(fatal) {
diff --git a/content/browser/ssl/ssl_cert_error_handler.h b/content/browser/ssl/ssl_cert_error_handler.h
index 696fb81..6946f42 100644
--- a/content/browser/ssl/ssl_cert_error_handler.h
+++ b/content/browser/ssl/ssl_cert_error_handler.h
@@ -24,7 +24,7 @@ class SSLCertErrorHandler : public SSLErrorHandler {
ResourceType::Type resource_type,
const GURL& url,
int render_process_id,
- int render_view_id,
+ int render_frame_id,
const net::SSLInfo& ssl_info,
bool fatal);
diff --git a/content/browser/ssl/ssl_error_handler.cc b/content/browser/ssl/ssl_error_handler.cc
index 8a322f7..ed4c2ac 100644
--- a/content/browser/ssl/ssl_error_handler.cc
+++ b/content/browser/ssl/ssl_error_handler.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "content/browser/frame_host/navigation_controller_impl.h"
-#include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
#include "content/browser/ssl/ssl_cert_error_handler.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/browser/browser_thread.h"
@@ -23,12 +23,12 @@ SSLErrorHandler::SSLErrorHandler(const base::WeakPtr<Delegate>& delegate,
ResourceType::Type resource_type,
const GURL& url,
int render_process_id,
- int render_view_id)
+ int render_frame_id)
: manager_(NULL),
request_id_(id),
delegate_(delegate),
render_process_id_(render_process_id),
- render_view_id_(render_view_id),
+ render_frame_id_(render_frame_id),
request_url_(url),
resource_type_(resource_type),
request_has_been_notified_(false) {
@@ -61,10 +61,10 @@ void SSLErrorHandler::Dispatch() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
WebContents* web_contents = NULL;
- RenderViewHostImpl* render_view_host =
- RenderViewHostImpl::FromID(render_process_id_, render_view_id_);
- if (render_view_host)
- web_contents = render_view_host->GetDelegate()->GetAsWebContents();
+ RenderFrameHost* render_frame_host =
+ RenderFrameHost::FromID(render_process_id_, render_frame_id_);
+ if (render_frame_host)
+ web_contents = WebContents::FromRenderFrameHost(render_frame_host);
if (!web_contents) {
// We arrived on the UI thread, but the tab we're looking for is no longer
diff --git a/content/browser/ssl/ssl_error_handler.h b/content/browser/ssl/ssl_error_handler.h
index 5f9e9e5..87bc1da 100644
--- a/content/browser/ssl/ssl_error_handler.h
+++ b/content/browser/ssl/ssl_error_handler.h
@@ -101,7 +101,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
void TakeNoAction();
int render_process_id() const { return render_process_id_; }
- int render_view_id() const { return render_view_id_; }
+ int render_frame_id() const { return render_frame_id_; }
protected:
friend class base::RefCountedThreadSafe<SSLErrorHandler>;
@@ -112,7 +112,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
ResourceType::Type resource_type,
const GURL& url,
int render_process_id,
- int render_view_id);
+ int render_frame_id);
virtual ~SSLErrorHandler();
@@ -149,7 +149,7 @@ class SSLErrorHandler : public base::RefCountedThreadSafe<SSLErrorHandler> {
// We use these members to find the correct SSLManager when we arrive on
// the UI thread.
int render_process_id_;
- int render_view_id_;
+ int render_frame_id_;
// The URL that we requested.
// This read-only member can be accessed on any thread.
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index b1eb51e..68906ce 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -53,7 +53,7 @@ void SSLManager::OnSSLCertificateError(
const ResourceType::Type resource_type,
const GURL& url,
int render_process_id,
- int render_view_id,
+ int render_frame_id,
const net::SSLInfo& ssl_info,
bool fatal) {
DCHECK(delegate.get());
@@ -61,7 +61,7 @@ void SSLManager::OnSSLCertificateError(
<< net::MapCertStatusToNetError(ssl_info.cert_status) << " id: "
<< id.child_id << "," << id.request_id << " resource_type: "
<< resource_type << " url: " << url.spec() << " render_process_id: "
- << render_process_id << " render_view_id: " << render_view_id
+ << render_process_id << " render_frame_id: " << render_frame_id
<< " cert_status: " << std::hex << ssl_info.cert_status;
// A certificate error occurred. Construct a SSLCertErrorHandler object and
@@ -74,7 +74,7 @@ void SSLManager::OnSSLCertificateError(
resource_type,
url,
render_process_id,
- render_view_id,
+ render_frame_id,
ssl_info,
fatal)));
}
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
index 45100a7..c195e98 100644
--- a/content/browser/ssl/ssl_manager.h
+++ b/content/browser/ssl/ssl_manager.h
@@ -54,7 +54,7 @@ class SSLManager {
ResourceType::Type resource_type,
const GURL& url,
int render_process_id,
- int render_view_id,
+ int render_frame_id,
const net::SSLInfo& ssl_info,
bool fatal);
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index ddf9e4c..1127f8d 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -187,7 +187,7 @@ void SSLPolicy::OnCertErrorInternal(SSLCertErrorHandler* handler,
CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE;
GetContentClient()->browser()->AllowCertificateError(
handler->render_process_id(),
- handler->render_view_id(),
+ handler->render_frame_id(),
handler->cert_error(),
handler->ssl_info(),
handler->request_url(),
generated by cgit v1.1 at 2025-03-24 04:33:02 +0000