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/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "chrome/browser/themes/theme_service_factory.h" | 24 #include "chrome/browser/themes/theme_service_factory.h" |
25 #include "chrome/browser/ui/browser.h" | 25 #include "chrome/browser/ui/browser.h" |
26 #include "chrome/browser/ui/browser_list.h" | 26 #include "chrome/browser/ui/browser_list.h" |
27 #include "chrome/browser/ui/browser_window.h" | 27 #include "chrome/browser/ui/browser_window.h" |
28 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 28 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
29 #include "chrome/common/chrome_notification_types.h" | 29 #include "chrome/common/chrome_notification_types.h" |
30 #include "chrome/common/chrome_switches.h" | 30 #include "chrome/common/chrome_switches.h" |
31 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" |
32 #include "chrome/common/render_messages.h" | 32 #include "chrome/common/render_messages.h" |
33 #include "chrome/common/url_constants.h" | 33 #include "chrome/common/url_constants.h" |
34 #include "content/browser/browsing_instance.h" | |
35 #include "content/browser/in_process_webkit/session_storage_namespace.h" | 34 #include "content/browser/in_process_webkit/session_storage_namespace.h" |
36 #include "content/browser/load_notification_details.h" | 35 #include "content/browser/load_notification_details.h" |
37 #include "content/browser/renderer_host/render_view_host.h" | 36 #include "content/browser/renderer_host/render_view_host.h" |
38 #include "content/browser/tab_contents/tab_contents_view.h" | 37 #include "content/browser/tab_contents/tab_contents_view.h" |
39 #include "content/public/browser/content_browser_client.h" | 38 #include "content/public/browser/content_browser_client.h" |
40 #include "content/public/browser/devtools_agent_host_registry.h" | 39 #include "content/public/browser/devtools_agent_host_registry.h" |
41 #include "content/public/browser/devtools_manager.h" | 40 #include "content/public/browser/devtools_manager.h" |
42 #include "content/public/browser/favicon_status.h" | 41 #include "content/public/browser/favicon_status.h" |
43 #include "content/public/browser/navigation_controller.h" | 42 #include "content/public/browser/navigation_controller.h" |
44 #include "content/public/browser/navigation_entry.h" | 43 #include "content/public/browser/navigation_entry.h" |
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
724 content); | 723 content); |
725 } | 724 } |
726 | 725 |
727 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { | 726 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { |
728 if (inspected_tab_ && inspected_tab_->web_contents()->GetDelegate()) { | 727 if (inspected_tab_ && inspected_tab_->web_contents()->GetDelegate()) { |
729 return inspected_tab_->web_contents()->GetDelegate()-> | 728 return inspected_tab_->web_contents()->GetDelegate()-> |
730 GetJavaScriptDialogCreator(); | 729 GetJavaScriptDialogCreator(); |
731 } | 730 } |
732 return content::WebContentsDelegate::GetJavaScriptDialogCreator(); | 731 return content::WebContentsDelegate::GetJavaScriptDialogCreator(); |
733 } | 732 } |
OLD | NEW |