Commit d98dbc8d authored by dgozman's avatar dgozman Committed by Commit bot

[DevTools] Move network protocol handler to RenderFrameHost.

BUG=470453

Review URL: https://codereview.chromium.org/1039543003

Cr-Commit-Position: refs/heads/master@{#322601}
parent 6bd4354c
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/client_certificate_delegate.h" #include "content/public/browser/client_certificate_delegate.h"
#include "content/public/browser/permission_type.h" #include "content/public/browser/permission_type.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
...@@ -501,12 +502,12 @@ bool AwContentBrowserClient::IsFastShutdownPossible() { ...@@ -501,12 +502,12 @@ bool AwContentBrowserClient::IsFastShutdownPossible() {
return false; return false;
} }
void AwContentBrowserClient::ClearCache(content::RenderViewHost* rvh) { void AwContentBrowserClient::ClearCache(content::RenderFrameHost* rfh) {
RemoveHttpDiskCache(rvh->GetProcess()->GetBrowserContext(), RemoveHttpDiskCache(rfh->GetProcess()->GetBrowserContext(),
rvh->GetProcess()->GetID()); rfh->GetProcess()->GetID());
} }
void AwContentBrowserClient::ClearCookies(content::RenderViewHost* rvh) { void AwContentBrowserClient::ClearCookies(content::RenderFrameHost* rfh) {
// TODO(boliu): Implement. // TODO(boliu): Implement.
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
......
...@@ -134,8 +134,8 @@ class AwContentBrowserClient : public content::ContentBrowserClient { ...@@ -134,8 +134,8 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
net::NetLog* GetNetLog() override; net::NetLog* GetNetLog() override;
content::AccessTokenStore* CreateAccessTokenStore() override; content::AccessTokenStore* CreateAccessTokenStore() override;
bool IsFastShutdownPossible() override; bool IsFastShutdownPossible() override;
void ClearCache(content::RenderViewHost* rvh) override; void ClearCache(content::RenderFrameHost* rfh) override;
void ClearCookies(content::RenderViewHost* rvh) override; void ClearCookies(content::RenderFrameHost* rfh) override;
base::FilePath GetDefaultDownloadDirectory() override; base::FilePath GetDefaultDownloadDirectory() override;
std::string GetDefaultDownloadName() override; std::string GetDefaultDownloadName() override;
void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override; void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
......
...@@ -2244,9 +2244,9 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( ...@@ -2244,9 +2244,9 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
handler->AddHandlerPair(&HandleWebUI, &HandleWebUIReverse); handler->AddHandlerPair(&HandleWebUI, &HandleWebUIReverse);
} }
void ChromeContentBrowserClient::ClearCache(RenderViewHost* rvh) { void ChromeContentBrowserClient::ClearCache(RenderFrameHost* rfh) {
Profile* profile = Profile::FromBrowserContext( Profile* profile = Profile::FromBrowserContext(
rvh->GetSiteInstance()->GetProcess()->GetBrowserContext()); rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
BrowsingDataRemover* remover = BrowsingDataRemover* remover =
BrowsingDataRemover::CreateForUnboundedRange(profile); BrowsingDataRemover::CreateForUnboundedRange(profile);
remover->Remove(BrowsingDataRemover::REMOVE_CACHE, remover->Remove(BrowsingDataRemover::REMOVE_CACHE,
...@@ -2254,9 +2254,9 @@ void ChromeContentBrowserClient::ClearCache(RenderViewHost* rvh) { ...@@ -2254,9 +2254,9 @@ void ChromeContentBrowserClient::ClearCache(RenderViewHost* rvh) {
// BrowsingDataRemover takes care of deleting itself when done. // BrowsingDataRemover takes care of deleting itself when done.
} }
void ChromeContentBrowserClient::ClearCookies(RenderViewHost* rvh) { void ChromeContentBrowserClient::ClearCookies(RenderFrameHost* rfh) {
Profile* profile = Profile::FromBrowserContext( Profile* profile = Profile::FromBrowserContext(
rvh->GetSiteInstance()->GetProcess()->GetBrowserContext()); rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
BrowsingDataRemover* remover = BrowsingDataRemover* remover =
BrowsingDataRemover::CreateForUnboundedRange(profile); BrowsingDataRemover::CreateForUnboundedRange(profile);
int remove_mask = BrowsingDataRemover::REMOVE_SITE_DATA; int remove_mask = BrowsingDataRemover::REMOVE_SITE_DATA;
......
...@@ -225,8 +225,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { ...@@ -225,8 +225,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
void OverrideWebkitPrefs(content::RenderViewHost* rvh, void OverrideWebkitPrefs(content::RenderViewHost* rvh,
content::WebPreferences* prefs) override; content::WebPreferences* prefs) override;
void BrowserURLHandlerCreated(content::BrowserURLHandler* handler) override; void BrowserURLHandlerCreated(content::BrowserURLHandler* handler) override;
void ClearCache(content::RenderViewHost* rvh) override; void ClearCache(content::RenderFrameHost* rfh) override;
void ClearCookies(content::RenderViewHost* rvh) override; void ClearCookies(content::RenderFrameHost* rfh) override;
base::FilePath GetDefaultDownloadDirectory() override; base::FilePath GetDefaultDownloadDirectory() override;
std::string GetDefaultDownloadName() override; std::string GetDefaultDownloadName() override;
void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override; void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
......
...@@ -19,7 +19,7 @@ NetworkHandler::NetworkHandler() : host_(nullptr) { ...@@ -19,7 +19,7 @@ NetworkHandler::NetworkHandler() : host_(nullptr) {
NetworkHandler::~NetworkHandler() { NetworkHandler::~NetworkHandler() {
} }
void NetworkHandler::SetRenderViewHost(RenderViewHost* host) { void NetworkHandler::SetRenderFrameHost(RenderFrameHost* host) {
host_ = host; host_ = host;
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
namespace content { namespace content {
class RenderViewHost; class RenderFrameHost;
namespace devtools { namespace devtools {
namespace network { namespace network {
...@@ -21,7 +21,7 @@ class NetworkHandler { ...@@ -21,7 +21,7 @@ class NetworkHandler {
NetworkHandler(); NetworkHandler();
virtual ~NetworkHandler(); virtual ~NetworkHandler();
void SetRenderViewHost(RenderViewHost* host); void SetRenderFrameHost(RenderFrameHost* host);
Response ClearBrowserCache(); Response ClearBrowserCache();
Response ClearBrowserCookies(); Response ClearBrowserCookies();
...@@ -33,7 +33,7 @@ class NetworkHandler { ...@@ -33,7 +33,7 @@ class NetworkHandler {
double upload_throughput); double upload_throughput);
private: private:
RenderViewHost* host_; RenderFrameHost* host_;
DISALLOW_COPY_AND_ASSIGN(NetworkHandler); DISALLOW_COPY_AND_ASSIGN(NetworkHandler);
}; };
......
...@@ -420,7 +420,7 @@ void RenderFrameDevToolsAgentHost::SetRenderFrameHost(RenderFrameHost* rfh) { ...@@ -420,7 +420,7 @@ void RenderFrameDevToolsAgentHost::SetRenderFrameHost(RenderFrameHost* rfh) {
dom_handler_->SetRenderViewHost(rvh); dom_handler_->SetRenderViewHost(rvh);
emulation_handler_->SetRenderViewHost(rvh); emulation_handler_->SetRenderViewHost(rvh);
input_handler_->SetRenderViewHost(rvh); input_handler_->SetRenderViewHost(rvh);
network_handler_->SetRenderViewHost(rvh); network_handler_->SetRenderFrameHost(render_frame_host_);
page_handler_->SetRenderViewHost(rvh); page_handler_->SetRenderViewHost(rvh);
service_worker_handler_->SetRenderFrameHost(render_frame_host_); service_worker_handler_->SetRenderFrameHost(render_frame_host_);
...@@ -442,7 +442,7 @@ void RenderFrameDevToolsAgentHost::ClearRenderFrameHost() { ...@@ -442,7 +442,7 @@ void RenderFrameDevToolsAgentHost::ClearRenderFrameHost() {
dom_handler_->SetRenderViewHost(nullptr); dom_handler_->SetRenderViewHost(nullptr);
emulation_handler_->SetRenderViewHost(nullptr); emulation_handler_->SetRenderViewHost(nullptr);
input_handler_->SetRenderViewHost(nullptr); input_handler_->SetRenderViewHost(nullptr);
network_handler_->SetRenderViewHost(nullptr); network_handler_->SetRenderFrameHost(nullptr);
page_handler_->SetRenderViewHost(nullptr); page_handler_->SetRenderViewHost(nullptr);
service_worker_handler_->SetRenderFrameHost(nullptr); service_worker_handler_->SetRenderFrameHost(nullptr);
} }
......
...@@ -505,10 +505,10 @@ class CONTENT_EXPORT ContentBrowserClient { ...@@ -505,10 +505,10 @@ class CONTENT_EXPORT ContentBrowserClient {
virtual void BrowserURLHandlerCreated(BrowserURLHandler* handler) {} virtual void BrowserURLHandlerCreated(BrowserURLHandler* handler) {}
// Clears browser cache. // Clears browser cache.
virtual void ClearCache(RenderViewHost* rvh) {} virtual void ClearCache(RenderFrameHost* rfh) {}
// Clears browser cookies. // Clears browser cookies.
virtual void ClearCookies(RenderViewHost* rvh) {} virtual void ClearCookies(RenderFrameHost* rfh) {}
// Returns the default download directory. // Returns the default download directory.
// This can be called on any thread. // This can be called on any thread.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment