| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/stringprintf.h" | 9 #include "base/stringprintf.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 } | 415 } |
| 416 | 416 |
| 417 // TODO(adriansc): Remove this method once refactoring changed all call sites. | 417 // TODO(adriansc): Remove this method once refactoring changed all call sites. |
| 418 TabContents* DevToolsWindow::OpenURLFromTab( | 418 TabContents* DevToolsWindow::OpenURLFromTab( |
| 419 TabContents* source, | 419 TabContents* source, |
| 420 const GURL& url, | 420 const GURL& url, |
| 421 const GURL& referrer, | 421 const GURL& referrer, |
| 422 WindowOpenDisposition disposition, | 422 WindowOpenDisposition disposition, |
| 423 content::PageTransition transition) { | 423 content::PageTransition transition) { |
| 424 return OpenURLFromTab(source, | 424 return OpenURLFromTab(source, |
| 425 OpenURLParams(url, referrer, disposition, transition)); | 425 OpenURLParams(url, referrer, disposition, transition, |
| 426 false)); |
| 426 } | 427 } |
| 427 | 428 |
| 428 TabContents* DevToolsWindow::OpenURLFromTab(TabContents* source, | 429 TabContents* DevToolsWindow::OpenURLFromTab(TabContents* source, |
| 429 const OpenURLParams& params) { | 430 const OpenURLParams& params) { |
| 430 if (inspected_tab_) { | 431 if (inspected_tab_) { |
| 431 OpenURLParams forward_params = params; | 432 OpenURLParams forward_params = params; |
| 432 forward_params.disposition = NEW_FOREGROUND_TAB; | 433 forward_params.disposition = NEW_FOREGROUND_TAB; |
| 433 forward_params.transition = content::PAGE_TRANSITION_LINK; | 434 forward_params.transition = content::PAGE_TRANSITION_LINK; |
| 434 return inspected_tab_->tab_contents()->OpenURL(forward_params); | 435 return inspected_tab_->tab_contents()->OpenURL(forward_params); |
| 435 } | 436 } |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 RequestSetDocked(false); | 650 RequestSetDocked(false); |
| 650 } | 651 } |
| 651 | 652 |
| 652 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { | 653 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { |
| 653 if (inspected_tab_ && inspected_tab_->tab_contents()->delegate()) { | 654 if (inspected_tab_ && inspected_tab_->tab_contents()->delegate()) { |
| 654 return inspected_tab_->tab_contents()->delegate()-> | 655 return inspected_tab_->tab_contents()->delegate()-> |
| 655 GetJavaScriptDialogCreator(); | 656 GetJavaScriptDialogCreator(); |
| 656 } | 657 } |
| 657 return TabContentsDelegate::GetJavaScriptDialogCreator(); | 658 return TabContentsDelegate::GetJavaScriptDialogCreator(); |
| 658 } | 659 } |
| OLD | NEW |