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

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

Issue 2859063002: [DevTools] Enable "auto attach to sub frames" by default (Closed)
Patch Set: Created 3 years, 8 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 | third_party/WebKit/Source/devtools/front_end/main/Main.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/devtools_window.cc
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 94d7954867a56e1507650596e98f016cab6262c5..ea831fc49f0b7439f654039bf976e6edc54f9737 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -647,19 +647,15 @@ void DevToolsWindow::InspectElement(
content::RenderFrameHost* inspected_frame_host,
int x,
int y) {
+ WebContents* web_contents =
+ WebContents::FromRenderFrameHost(inspected_frame_host);
scoped_refptr<DevToolsAgentHost> agent(
- DevToolsAgentHost::GetOrCreateFor(inspected_frame_host));
+ DevToolsAgentHost::GetOrCreateFor(web_contents));
bool should_measure_time = FindDevToolsWindow(agent.get()) == NULL;
base::TimeTicks start_time = base::TimeTicks::Now();
// TODO(loislo): we should initiate DevTools window opening from within
// renderer. Otherwise, we still can hit a race condition here.
- if (agent->GetType() == content::DevToolsAgentHost::kTypePage) {
- OpenDevToolsWindow(agent->GetWebContents(),
- DevToolsToggleAction::ShowElementsPanel());
- } else {
- OpenDevToolsWindowForFrame(Profile::FromBrowserContext(
- agent->GetBrowserContext()), agent);
- }
+ OpenDevToolsWindow(web_contents, DevToolsToggleAction::ShowElementsPanel());
DevToolsWindow* window = FindDevToolsWindow(agent.get());
if (window) {
agent->InspectElement(window->bindings_, x, y);
« no previous file with comments | « no previous file | third_party/WebKit/Source/devtools/front_end/main/Main.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698