| 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 "chrome/browser/devtools/devtools_window.h" | 5 #include "chrome/browser/devtools/devtools_window.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 } | 416 } |
| 417 | 417 |
| 418 // static | 418 // static |
| 419 DevToolsWindow* DevToolsWindow::OpenDevToolsWindow( | 419 DevToolsWindow* DevToolsWindow::OpenDevToolsWindow( |
| 420 content::WebContents* inspected_web_contents, | 420 content::WebContents* inspected_web_contents, |
| 421 const DevToolsToggleAction& action) { | 421 const DevToolsToggleAction& action) { |
| 422 return ToggleDevToolsWindow(inspected_web_contents, true, action, ""); | 422 return ToggleDevToolsWindow(inspected_web_contents, true, action, ""); |
| 423 } | 423 } |
| 424 | 424 |
| 425 // static | 425 // static |
| 426 DevToolsWindow* DevToolsWindow::OpenDevToolsWindow( |
| 427 Profile* profile, |
| 428 const scoped_refptr<content::DevToolsAgentHost>& agent_host) { |
| 429 DevToolsWindow* window = FindDevToolsWindow(agent_host.get()); |
| 430 if (!window) { |
| 431 window = DevToolsWindow::Create( |
| 432 profile, GURL(), nullptr, false, std::string(), false, std::string()); |
| 433 DCHECK(window); |
| 434 window->bindings_->AttachTo(agent_host); |
| 435 } |
| 436 window->ScheduleShow(DevToolsToggleAction::Show()); |
| 437 return window; |
| 438 } |
| 439 |
| 440 // static |
| 426 DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow( | 441 DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow( |
| 427 Browser* browser, | 442 Browser* browser, |
| 428 const DevToolsToggleAction& action) { | 443 const DevToolsToggleAction& action) { |
| 429 if (action.type() == DevToolsToggleAction::kToggle && | 444 if (action.type() == DevToolsToggleAction::kToggle && |
| 430 browser->is_devtools()) { | 445 browser->is_devtools()) { |
| 431 browser->tab_strip_model()->CloseAllTabs(); | 446 browser->tab_strip_model()->CloseAllTabs(); |
| 432 return NULL; | 447 return NULL; |
| 433 } | 448 } |
| 434 | 449 |
| 435 return ToggleDevToolsWindow( | 450 return ToggleDevToolsWindow( |
| (...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1203 closure.Run(); | 1218 closure.Run(); |
| 1204 return; | 1219 return; |
| 1205 } | 1220 } |
| 1206 load_completed_callback_ = closure; | 1221 load_completed_callback_ = closure; |
| 1207 } | 1222 } |
| 1208 | 1223 |
| 1209 bool DevToolsWindow::ForwardKeyboardEvent( | 1224 bool DevToolsWindow::ForwardKeyboardEvent( |
| 1210 const content::NativeWebKeyboardEvent& event) { | 1225 const content::NativeWebKeyboardEvent& event) { |
| 1211 return event_forwarder_->ForwardEvent(event); | 1226 return event_forwarder_->ForwardEvent(event); |
| 1212 } | 1227 } |
| OLD | NEW |