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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 typedef std::vector<DevToolsWindow*> DevToolsWindowList; | 49 typedef std::vector<DevToolsWindow*> DevToolsWindowList; |
50 namespace { | 50 namespace { |
51 base::LazyInstance<DevToolsWindowList>::Leaky | 51 base::LazyInstance<DevToolsWindowList>::Leaky |
52 g_instances = LAZY_INSTANCE_INITIALIZER; | 52 g_instances = LAZY_INSTANCE_INITIALIZER; |
53 } // namespace | 53 } // namespace |
54 | 54 |
55 using content::DevToolsAgentHost; | 55 using content::DevToolsAgentHost; |
56 using content::DevToolsAgentHostRegistry; | 56 using content::DevToolsAgentHostRegistry; |
57 using content::DevToolsClientHost; | 57 using content::DevToolsClientHost; |
58 using content::DevToolsManager; | 58 using content::DevToolsManager; |
| 59 using content::NativeWebKeyboardEvent; |
59 using content::NavigationController; | 60 using content::NavigationController; |
60 using content::NavigationEntry; | 61 using content::NavigationEntry; |
61 using content::OpenURLParams; | 62 using content::OpenURLParams; |
62 using content::RenderViewHost; | 63 using content::RenderViewHost; |
63 using content::WebContents; | 64 using content::WebContents; |
64 | 65 |
65 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp"; | 66 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp"; |
66 | 67 |
67 const char kDockSideBottom[] = "bottom"; | 68 const char kDockSideBottom[] = "bottom"; |
68 const char kDockSideRight[] = "right"; | 69 const char kDockSideRight[] = "right"; |
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
754 CallClientFunction("InspectorFrontendAPI.appendedToURL", &url_value); | 755 CallClientFunction("InspectorFrontendAPI.appendedToURL", &url_value); |
755 } | 756 } |
756 | 757 |
757 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { | 758 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { |
758 if (inspected_tab_ && inspected_tab_->web_contents()->GetDelegate()) { | 759 if (inspected_tab_ && inspected_tab_->web_contents()->GetDelegate()) { |
759 return inspected_tab_->web_contents()->GetDelegate()-> | 760 return inspected_tab_->web_contents()->GetDelegate()-> |
760 GetJavaScriptDialogCreator(); | 761 GetJavaScriptDialogCreator(); |
761 } | 762 } |
762 return content::WebContentsDelegate::GetJavaScriptDialogCreator(); | 763 return content::WebContentsDelegate::GetJavaScriptDialogCreator(); |
763 } | 764 } |
OLD | NEW |