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

Unified Diff: content/browser/devtools/render_view_devtools_agent_host.cc

Issue 459403002: DevTools: Added service workers to remote debugging targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android fixes Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/render_view_devtools_agent_host.cc
diff --git a/content/browser/devtools/render_view_devtools_agent_host.cc b/content/browser/devtools/render_view_devtools_agent_host.cc
index b16c2dce27992fee5cb78f8481dec6fb40f1a337..61fad4cdfb30c5138281c49edbceadd38c827627 100644
--- a/content/browser/devtools/render_view_devtools_agent_host.cc
+++ b/content/browser/devtools/render_view_devtools_agent_host.cc
@@ -72,7 +72,7 @@ bool DevToolsAgentHost::IsDebuggerAttached(WebContents* web_contents) {
}
//static
-std::vector<WebContents*> DevToolsAgentHost::GetInspectableWebContents() {
+std::vector<WebContents*> DevToolsAgentHostImpl::GetInspectableWebContents() {
std::set<WebContents*> set;
scoped_ptr<RenderWidgetHostIterator> widgets(
RenderWidgetHost::GetRenderWidgetHosts());
@@ -370,6 +370,18 @@ void RenderViewDevToolsAgentHost::ConnectWebContents(WebContents* wc) {
ConnectRenderViewHost(wc->GetRenderViewHost());
}
+GURL RenderViewDevToolsAgentHost::GetURL() {
+ if (render_view_host_) {
+ if (content::RenderFrameHost* rfh = render_view_host_->GetMainFrame()) {
+ if (rfh->IsCrossProcessSubframe())
+ return rfh->GetLastCommittedURL();
+ }
+ if (WebContents* web_contents = GetWebContents())
+ return web_contents->GetURL();
+ }
+ return GURL();
+}
+
void RenderViewDevToolsAgentHost::ConnectRenderViewHost(RenderViewHost* rvh) {
SetRenderViewHost(rvh);
if (IsAttached())

Powered by Google App Engine
This is Rietveld 408576698