Chromium Code Reviews| Index: chrome/browser/devtools/devtools_window.cc |
| diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc |
| index 0123c053cf61eac1699904e6c08a09a59847df87..ce54e24ea9e78d4983d979b0c1f5fe90d42baa03 100644 |
| --- a/chrome/browser/devtools/devtools_window.cc |
| +++ b/chrome/browser/devtools/devtools_window.cc |
| @@ -498,20 +498,27 @@ void DevToolsWindow::AddDevToolsExtensionsToClient() { |
| WebContents* DevToolsWindow::OpenURLFromTab(WebContents* source, |
| const OpenURLParams& params) { |
| - if (params.url.SchemeIs(chrome::kChromeDevToolsScheme)) { |
| - chrome::NavigateParams nav_params(profile_, params.url, params.transition); |
| - FillNavigateParamsFromOpenURLParams(&nav_params, params); |
| - nav_params.source_contents = source; |
| - nav_params.tabstrip_add_types = TabStripModel::ADD_NONE; |
| - nav_params.window_action = chrome::NavigateParams::SHOW_WINDOW; |
| - nav_params.user_gesture = true; |
| - chrome::Navigate(&nav_params); |
| - return nav_params.target_contents; |
| - } |
| - |
| - if (inspected_web_contents_) |
| - return inspected_web_contents_->OpenURL(params); |
| - return NULL; |
| + if (!params.url.SchemeIs(chrome::kChromeDevToolsScheme)) { |
| + if (inspected_web_contents_) |
|
pfeldman
2013/03/07 18:30:14
Note that Vlad is removing the inspected_web_conte
|
| + return inspected_web_contents_->OpenURL(params); |
| + return NULL; |
| + } |
| + DevToolsManager* manager = DevToolsManager::GetInstance(); |
| + scoped_refptr<DevToolsAgentHost> agent_host( |
| + manager->GetDevToolsAgentHostFor(frontend_host_.get())); |
| + if (!agent_host) |
| + return NULL; |
| + manager->ClientHostClosing(frontend_host_.get()); |
| + manager->RegisterDevToolsClientHostFor(agent_host, frontend_host_.get()); |
| + |
| + chrome::NavigateParams nav_params(profile_, params.url, params.transition); |
| + FillNavigateParamsFromOpenURLParams(&nav_params, params); |
| + nav_params.source_contents = source; |
| + nav_params.tabstrip_add_types = TabStripModel::ADD_NONE; |
| + nav_params.window_action = chrome::NavigateParams::SHOW_WINDOW; |
| + nav_params.user_gesture = true; |
| + chrome::Navigate(&nav_params); |
| + return nav_params.target_contents; |
| } |
| void DevToolsWindow::CallClientFunction(const std::string& function_name, |