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

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

Issue 349033009: DevTools: Added service workers to chrome://inspect/#devices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed lifetime again Created 6 years, 5 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 480b4281de76ba26cc0e3f3f57e68fd8df285138..779bd9f266af8c646e4dd02a29eec1397b747556 100644
--- a/content/browser/devtools/render_view_devtools_agent_host.cc
+++ b/content/browser/devtools/render_view_devtools_agent_host.cc
@@ -109,7 +109,7 @@ bool DevToolsAgentHost::IsDebuggerAttached(WebContents* web_contents) {
}
//static
-std::vector<RenderViewHost*> DevToolsAgentHost::GetValidRenderViewHosts() {
+std::vector<RenderViewHost*> DevToolsAgentHostImpl::GetValidRenderViewHosts() {
std::vector<RenderViewHost*> result;
scoped_ptr<RenderWidgetHostIterator> widgets(
RenderWidgetHost::GetRenderWidgetHosts());
@@ -417,6 +417,20 @@ void RenderViewDevToolsAgentHost::DisconnectRenderViewHost() {
ClearRenderViewHost();
}
+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 =
+ WebContents::FromRenderViewHost(render_view_host_)) {
+ return web_contents->GetURL();
+ }
+ }
+ return GURL();
+}
+
void RenderViewDevToolsAgentHost::RenderViewCrashed() {
scoped_refptr<DevToolsProtocol::Notification> notification =
DevToolsProtocol::CreateNotification(
« no previous file with comments | « content/browser/devtools/render_view_devtools_agent_host.h ('k') | content/browser/service_worker/embedded_worker_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698