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

Unified Diff: chrome/browser/devtools/chrome_devtools_manager_delegate.cc

Issue 2303823002: DevTools: check for target being oopif prior to matching its web contents. (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/chrome_devtools_manager_delegate.cc
diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
index 53aa07c2f4046761d7b6a89fa007427d8299cae5..1fef75dcc0bf13e00affb6283a76533e1daf90a0 100644
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
@@ -70,14 +70,14 @@ std::string ChromeDevToolsManagerDelegate::GetTargetType(
if (guest_contents)
return kTypeWebView;
+ if (host->GetParent())
+ return content::DevToolsAgentHost::kTypeFrame;
+
for (TabContentsIterator it; !it.done(); it.Next()) {
if (*it == web_contents)
return content::DevToolsAgentHost::kTypePage;
}
- if (host->GetParent())
- return content::DevToolsAgentHost::kTypeFrame;
-
const extensions::Extension* extension = extensions::ExtensionRegistry::Get(
web_contents->GetBrowserContext())->enabled_extensions().GetByID(
host->GetLastCommittedURL().host());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698