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" |
11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/extensions/extension_service.h" | 12 #include "chrome/browser/extensions/extension_service.h" |
13 #include "chrome/browser/prefs/pref_service.h" | 13 #include "chrome/browser/prefs/pref_service.h" |
14 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 14 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/sessions/restore_tab_helper.h" | 16 #include "chrome/browser/sessions/restore_tab_helper.h" |
17 #include "chrome/browser/tabs/tab_strip_model.h" | 17 #include "chrome/browser/tabs/tab_strip_model.h" |
18 #include "chrome/browser/themes/theme_service.h" | 18 #include "chrome/browser/themes/theme_service.h" |
19 #include "chrome/browser/themes/theme_service_factory.h" | 19 #include "chrome/browser/themes/theme_service_factory.h" |
20 #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" | |
pfeldman
2011/07/07 14:06:16
Could you try getting dialog creator from the brow
| |
20 #include "chrome/browser/ui/browser.h" | 21 #include "chrome/browser/ui/browser.h" |
21 #include "chrome/browser/ui/browser_list.h" | 22 #include "chrome/browser/ui/browser_list.h" |
22 #include "chrome/browser/ui/browser_window.h" | 23 #include "chrome/browser/ui/browser_window.h" |
23 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 24 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
24 #include "chrome/common/pref_names.h" | 25 #include "chrome/common/pref_names.h" |
25 #include "chrome/common/render_messages.h" | 26 #include "chrome/common/render_messages.h" |
26 #include "chrome/common/url_constants.h" | 27 #include "chrome/common/url_constants.h" |
27 #include "content/browser/debugger/devtools_manager.h" | 28 #include "content/browser/debugger/devtools_manager.h" |
28 #include "content/browser/debugger/devtools_window.h" | 29 #include "content/browser/debugger/devtools_window.h" |
29 #include "content/browser/in_process_webkit/session_storage_namespace.h" | 30 #include "content/browser/in_process_webkit/session_storage_namespace.h" |
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
465 if (docked_) { | 466 if (docked_) { |
466 if (event.windowsKeyCode == 0x08) { | 467 if (event.windowsKeyCode == 0x08) { |
467 // Do not navigate back in history on Windows (http://crbug.com/74156). | 468 // Do not navigate back in history on Windows (http://crbug.com/74156). |
468 return; | 469 return; |
469 } | 470 } |
470 BrowserWindow* inspected_window = GetInspectedBrowserWindow(); | 471 BrowserWindow* inspected_window = GetInspectedBrowserWindow(); |
471 if (inspected_window) | 472 if (inspected_window) |
472 inspected_window->HandleKeyboardEvent(event); | 473 inspected_window->HandleKeyboardEvent(event); |
473 } | 474 } |
474 } | 475 } |
476 | |
477 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { | |
478 return GetJavaScriptDialogCreatorInstance(); | |
479 } | |
OLD | NEW |