summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/frame_host/render_frame_host_impl.cc4
-rw-r--r--content/browser/frame_host/render_frame_host_impl.h1
-rw-r--r--content/browser/loader/resource_loader.cc6
-rw-r--r--content/browser/renderer_host/socket_stream_dispatcher_host.cc8
-rw-r--r--content/browser/renderer_host/socket_stream_dispatcher_host.h2
-rw-r--r--content/browser/renderer_host/socket_stream_host.cc6
-rw-r--r--content/browser/renderer_host/socket_stream_host.h6
-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
14 files changed, 37 insertions, 32 deletions
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index e021d19..0d16779 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -95,6 +95,10 @@ gfx::NativeView RenderFrameHostImpl::GetNativeView() {
return view->GetNativeView();
}
+RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() {
+ return render_view_host_;
+}
+
bool RenderFrameHostImpl::Send(IPC::Message* message) {
return GetProcess()->Send(message);
}
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 8dfc7e5..155b427 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -36,6 +36,7 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
virtual RenderProcessHost* GetProcess() OVERRIDE;
virtual int GetRoutingID() OVERRIDE;
virtual gfx::NativeView GetNativeView() OVERRIDE;
+ virtual RenderViewHost* GetRenderViewHost() OVERRIDE;
// IPC::Sender
virtual bool Send(IPC::Message* msg) OVERRIDE;
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 886dba4..00760d0 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -279,8 +279,8 @@ void ResourceLoader::OnSSLCertificateError(net::URLRequest* request,
ResourceRequestInfoImpl* info = GetRequestInfo();
int render_process_id;
- int render_view_id;
- if (!info->GetAssociatedRenderView(&render_process_id, &render_view_id))
+ int render_frame_id;
+ if (!info->GetAssociatedRenderFrame(&render_process_id, &render_frame_id))
NOTREACHED();
SSLManager::OnSSLCertificateError(
@@ -289,7 +289,7 @@ void ResourceLoader::OnSSLCertificateError(net::URLRequest* request,
info->GetResourceType(),
request_->url(),
render_process_id,
- render_view_id,
+ render_frame_id,
ssl_info,
fatal);
}
diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.cc b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
index 677c281..204bf8e 100644
--- a/content/browser/renderer_host/socket_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
@@ -144,7 +144,7 @@ void SocketStreamDispatcherHost::OnSSLCertificateError(
GlobalRequestID request_id(-1, socket_id);
SSLManager::OnSSLCertificateError(
weak_ptr_factory_.GetWeakPtr(), request_id, ResourceType::SUB_RESOURCE,
- socket->url(), render_process_id_, socket_stream_host->render_view_id(),
+ socket->url(), render_process_id_, socket_stream_host->render_frame_id(),
ssl_info, fatal);
}
@@ -195,11 +195,11 @@ SocketStreamDispatcherHost::~SocketStreamDispatcherHost() {
}
// Message handlers called by OnMessageReceived.
-void SocketStreamDispatcherHost::OnConnect(int render_view_id,
+void SocketStreamDispatcherHost::OnConnect(int render_frame_id,
const GURL& url,
int socket_id) {
DVLOG(2) << "SocketStreamDispatcherHost::OnConnect"
- << " render_view_id=" << render_view_id
+ << " render_frame_id=" << render_frame_id
<< " url=" << url
<< " socket_id=" << socket_id;
DCHECK_NE(kNoSocketId, socket_id);
@@ -223,7 +223,7 @@ void SocketStreamDispatcherHost::OnConnect(int render_view_id,
// Note that the SocketStreamHost is responsible for checking that |url|
// is valid.
SocketStreamHost* socket_stream_host =
- new SocketStreamHost(this, render_view_id, socket_id);
+ new SocketStreamHost(this, render_frame_id, socket_id);
hosts_.AddWithID(socket_stream_host, socket_id);
socket_stream_host->Connect(url, GetURLRequestContext());
DVLOG(2) << "SocketStreamDispatcherHost::OnConnect -> " << socket_id;
diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.h b/content/browser/renderer_host/socket_stream_dispatcher_host.h
index 958eada..163f845 100644
--- a/content/browser/renderer_host/socket_stream_dispatcher_host.h
+++ b/content/browser/renderer_host/socket_stream_dispatcher_host.h
@@ -76,7 +76,7 @@ class SocketStreamDispatcherHost
private:
// Message handlers called by OnMessageReceived.
- void OnConnect(int render_view_id, const GURL& url, int socket_id);
+ void OnConnect(int render_frame_id, const GURL& url, int socket_id);
void OnSendData(int socket_id, const std::vector<char>& data);
void OnCloseReq(int socket_id);
diff --git a/content/browser/renderer_host/socket_stream_host.cc b/content/browser/renderer_host/socket_stream_host.cc
index ecf6cee..f09f2f3 100644
--- a/content/browser/renderer_host/socket_stream_host.cc
+++ b/content/browser/renderer_host/socket_stream_host.cc
@@ -28,13 +28,13 @@ class SocketStreamId : public net::SocketStream::UserData {
SocketStreamHost::SocketStreamHost(
net::SocketStream::Delegate* delegate,
- int render_view_id,
+ int render_frame_id,
int socket_id)
: delegate_(delegate),
- render_view_id_(render_view_id),
+ render_frame_id_(render_frame_id),
socket_id_(socket_id) {
DCHECK_NE(socket_id_, kNoSocketId);
- VLOG(1) << "SocketStreamHost: render_view_id=" << render_view_id
+ VLOG(1) << "SocketStreamHost: render_frame_id=" << render_frame_id
<< " socket_id=" << socket_id_;
}
diff --git a/content/browser/renderer_host/socket_stream_host.h b/content/browser/renderer_host/socket_stream_host.h
index 237e915..eb9b719 100644
--- a/content/browser/renderer_host/socket_stream_host.h
+++ b/content/browser/renderer_host/socket_stream_host.h
@@ -29,14 +29,14 @@ namespace content {
class SocketStreamHost {
public:
SocketStreamHost(net::SocketStream::Delegate* delegate,
- int render_view_id,
+ int render_frame_id,
int socket_id);
~SocketStreamHost();
// Gets socket_id associated with |socket|.
static int SocketIdFromSocketStream(const net::SocketStream* socket);
- int render_view_id() const { return render_view_id_; }
+ int render_frame_id() const { return render_frame_id_; }
int socket_id() const { return socket_id_; }
// Starts to open connection to |url|.
@@ -66,7 +66,7 @@ class SocketStreamHost {
private:
net::SocketStream::Delegate* delegate_;
- int render_view_id_;
+ int render_frame_id_;
int socket_id_;
scoped_refptr<net::SocketStreamJob> job_;
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-29 21:53:14 +0000