diff options
Diffstat (limited to 'chromium/chrome/browser/extensions/api/debugger/debugger_api.cc')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/debugger/debugger_api.cc | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/chromium/chrome/browser/extensions/api/debugger/debugger_api.cc b/chromium/chrome/browser/extensions/api/debugger/debugger_api.cc index e5cd5ab180e..56e94b5d685 100644 --- a/chromium/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chromium/chrome/browser/extensions/api/debugger/debugger_api.cc @@ -146,8 +146,7 @@ class ExtensionDevToolsClientHost : public content::DevToolsAgentHostClient, void AgentHostClosed(DevToolsAgentHost* agent_host) override; void DispatchProtocolMessage(DevToolsAgentHost* agent_host, const std::string& message) override; - bool MayAttachToRenderer(content::RenderFrameHost* render_frame_host, - bool is_webui) override; + bool MayAttachToURL(const GURL& url, bool is_webui) override; bool MayAttachToBrowser() override; bool MayReadLocalFiles() override; bool MayWriteLocalFiles() override; @@ -358,29 +357,17 @@ void ExtensionDevToolsClientHost::DispatchProtocolMessage( } } -bool ExtensionDevToolsClientHost::MayAttachToRenderer( - content::RenderFrameHost* render_frame_host, - bool is_webui) { +bool ExtensionDevToolsClientHost::MayAttachToURL(const GURL& url, + bool is_webui) { if (is_webui) return false; - if (!render_frame_host) + // Allow the extension to attach to about:blank. + if (url.is_empty() || url == "about:") return true; std::string error; - // We check the site instance URL here (instead of - // RenderFrameHost::GetLastCommittedURL()) because it's too early in the - // navigation for anything else. - const GURL& site_instance_url = - render_frame_host->GetSiteInstance()->GetSiteURL(); - - if (site_instance_url.is_empty() || site_instance_url == "about:") { - // Allow the extension to attach to about:blank. - return true; - } - - return ExtensionCanAttachToURL(*extension_, site_instance_url, profile_, - &error); + return ExtensionCanAttachToURL(*extension_, url, profile_, &error); } bool ExtensionDevToolsClientHost::MayAttachToBrowser() { |