OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <algorithm> | 5 #include <algorithm> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
491 extensions::APIPermission::kExperimental); | 491 extensions::APIPermission::kExperimental); |
492 extension_info->Set("exposeExperimentalAPIs", | 492 extension_info->Set("exposeExperimentalAPIs", |
493 new base::FundamentalValue(allow_experimental)); | 493 new base::FundamentalValue(allow_experimental)); |
494 results.Append(extension_info); | 494 results.Append(extension_info); |
495 } | 495 } |
496 CallClientFunction("WebInspector.addExtensions", &results); | 496 CallClientFunction("WebInspector.addExtensions", &results); |
497 } | 497 } |
498 | 498 |
499 WebContents* DevToolsWindow::OpenURLFromTab(WebContents* source, | 499 WebContents* DevToolsWindow::OpenURLFromTab(WebContents* source, |
500 const OpenURLParams& params) { | 500 const OpenURLParams& params) { |
501 if (params.url.SchemeIs(chrome::kChromeDevToolsScheme)) { | 501 if (!params.url.SchemeIs(chrome::kChromeDevToolsScheme)) { |
502 chrome::NavigateParams nav_params(profile_, params.url, params.transition); | 502 if (inspected_web_contents_) |
pfeldman
2013/03/07 18:30:14
Note that Vlad is removing the inspected_web_conte
| |
503 FillNavigateParamsFromOpenURLParams(&nav_params, params); | 503 return inspected_web_contents_->OpenURL(params); |
504 nav_params.source_contents = source; | 504 return NULL; |
505 nav_params.tabstrip_add_types = TabStripModel::ADD_NONE; | |
506 nav_params.window_action = chrome::NavigateParams::SHOW_WINDOW; | |
507 nav_params.user_gesture = true; | |
508 chrome::Navigate(&nav_params); | |
509 return nav_params.target_contents; | |
510 } | 505 } |
506 DevToolsManager* manager = DevToolsManager::GetInstance(); | |
507 scoped_refptr<DevToolsAgentHost> agent_host( | |
508 manager->GetDevToolsAgentHostFor(frontend_host_.get())); | |
509 if (!agent_host) | |
510 return NULL; | |
511 manager->ClientHostClosing(frontend_host_.get()); | |
512 manager->RegisterDevToolsClientHostFor(agent_host, frontend_host_.get()); | |
511 | 513 |
512 if (inspected_web_contents_) | 514 chrome::NavigateParams nav_params(profile_, params.url, params.transition); |
513 return inspected_web_contents_->OpenURL(params); | 515 FillNavigateParamsFromOpenURLParams(&nav_params, params); |
514 return NULL; | 516 nav_params.source_contents = source; |
517 nav_params.tabstrip_add_types = TabStripModel::ADD_NONE; | |
518 nav_params.window_action = chrome::NavigateParams::SHOW_WINDOW; | |
519 nav_params.user_gesture = true; | |
520 chrome::Navigate(&nav_params); | |
521 return nav_params.target_contents; | |
515 } | 522 } |
516 | 523 |
517 void DevToolsWindow::CallClientFunction(const std::string& function_name, | 524 void DevToolsWindow::CallClientFunction(const std::string& function_name, |
518 const Value* arg1, | 525 const Value* arg1, |
519 const Value* arg2) { | 526 const Value* arg2) { |
520 std::string params; | 527 std::string params; |
521 if (arg1) { | 528 if (arg1) { |
522 std::string json; | 529 std::string json; |
523 base::JSONWriter::Write(arg1, &json); | 530 base::JSONWriter::Write(arg1, &json); |
524 params.append(json); | 531 params.append(json); |
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1000 | 1007 |
1001 // static | 1008 // static |
1002 DevToolsDockSide DevToolsWindow::SideFromString( | 1009 DevToolsDockSide DevToolsWindow::SideFromString( |
1003 const std::string& dock_side) { | 1010 const std::string& dock_side) { |
1004 if (dock_side == kDockSideRight) | 1011 if (dock_side == kDockSideRight) |
1005 return DEVTOOLS_DOCK_SIDE_RIGHT; | 1012 return DEVTOOLS_DOCK_SIDE_RIGHT; |
1006 if (dock_side == kDockSideBottom) | 1013 if (dock_side == kDockSideBottom) |
1007 return DEVTOOLS_DOCK_SIDE_BOTTOM; | 1014 return DEVTOOLS_DOCK_SIDE_BOTTOM; |
1008 return DEVTOOLS_DOCK_SIDE_UNDOCKED; | 1015 return DEVTOOLS_DOCK_SIDE_UNDOCKED; |
1009 } | 1016 } |
OLD | NEW |