| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/json/json_writer.h" | 6 #include "base/json/json_writer.h" |
| 7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
| 8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 if (docked_) { | 465 if (docked_) { |
| 466 if (event.windowsKeyCode == 0x08) { | 466 if (event.windowsKeyCode == 0x08) { |
| 467 // Do not navigate back in history on Windows (http://crbug.com/74156). | 467 // Do not navigate back in history on Windows (http://crbug.com/74156). |
| 468 return; | 468 return; |
| 469 } | 469 } |
| 470 BrowserWindow* inspected_window = GetInspectedBrowserWindow(); | 470 BrowserWindow* inspected_window = GetInspectedBrowserWindow(); |
| 471 if (inspected_window) | 471 if (inspected_window) |
| 472 inspected_window->HandleKeyboardEvent(event); | 472 inspected_window->HandleKeyboardEvent(event); |
| 473 } | 473 } |
| 474 } | 474 } |
| 475 |
| 476 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { |
| 477 if (inspected_tab_) { |
| 478 return inspected_tab_->tab_contents()->delegate()-> |
| 479 GetJavaScriptDialogCreator(); |
| 480 } |
| 481 return TabContentsDelegate::GetJavaScriptDialogCreator(); |
| 482 } |
| OLD | NEW |