OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 22 matching lines...) Expand all Loading... |
33 | 33 |
34 #include "DOMWindow.h" | 34 #include "DOMWindow.h" |
35 #include "FloatRect.h" | 35 #include "FloatRect.h" |
36 #include "InspectorController.h" | 36 #include "InspectorController.h" |
37 #include "Page.h" | 37 #include "Page.h" |
38 #include "Settings.h" | 38 #include "Settings.h" |
39 #include "WebRect.h" | 39 #include "WebRect.h" |
40 #include "WebURL.h" | 40 #include "WebURL.h" |
41 #include "WebURLRequest.h" | 41 #include "WebURLRequest.h" |
42 #include "WebViewClient.h" | 42 #include "WebViewClient.h" |
| 43 #include "WebViewImpl.h" |
43 #include <wtf/Vector.h> | 44 #include <wtf/Vector.h> |
44 | 45 |
45 // FIXME: Remove this once WebDevToolsAgentImpl and WebViewImpl move out of glue/. | 46 // FIXME: Remove this once WebDevToolsAgentImpl and WebViewImpl move out of glue/. |
46 #include "webkit/glue/webdevtoolsagent_impl.h" | 47 #include "webkit/glue/webdevtoolsagent_impl.h" |
47 #include "webkit/glue/webview_impl.h" | |
48 | 48 |
49 using namespace WebCore; | 49 using namespace WebCore; |
50 | 50 |
51 namespace WebKit { | 51 namespace WebKit { |
52 | 52 |
53 InspectorClientImpl::InspectorClientImpl(WebViewImpl* webView) | 53 InspectorClientImpl::InspectorClientImpl(WebViewImpl* webView) |
54 : m_inspectedWebView(webView) | 54 : m_inspectedWebView(webView) |
55 { | 55 { |
56 ASSERT(m_inspectedWebView); | 56 ASSERT(m_inspectedWebView); |
57 } | 57 } |
(...skipping 10 matching lines...) Expand all Loading... |
68 Page* InspectorClientImpl::createPage() | 68 Page* InspectorClientImpl::createPage() |
69 { | 69 { |
70 // This method should never be called in Chrome as inspector front-end lives | 70 // This method should never be called in Chrome as inspector front-end lives |
71 // in a separate process. | 71 // in a separate process. |
72 ASSERT_NOT_REACHED(); | 72 ASSERT_NOT_REACHED(); |
73 return 0; | 73 return 0; |
74 } | 74 } |
75 | 75 |
76 void InspectorClientImpl::showWindow() | 76 void InspectorClientImpl::showWindow() |
77 { | 77 { |
78 ASSERT(m_inspectedWebView->GetWebDevToolsAgentImpl()); | 78 ASSERT(m_inspectedWebView->devToolsAgentImpl()); |
79 m_inspectedWebView->page()->inspectorController()->setWindowVisible(true); | 79 m_inspectedWebView->page()->inspectorController()->setWindowVisible(true); |
80 } | 80 } |
81 | 81 |
82 void InspectorClientImpl::closeWindow() | 82 void InspectorClientImpl::closeWindow() |
83 { | 83 { |
84 if (m_inspectedWebView->page()) | 84 if (m_inspectedWebView->page()) |
85 m_inspectedWebView->page()->inspectorController()->setWindowVisible(false); | 85 m_inspectedWebView->page()->inspectorController()->setWindowVisible(false); |
86 } | 86 } |
87 | 87 |
88 bool InspectorClientImpl::windowVisible() | 88 bool InspectorClientImpl::windowVisible() |
89 { | 89 { |
90 ASSERT(m_inspectedWebView->GetWebDevToolsAgentImpl()); | 90 ASSERT(m_inspectedWebView->devToolsAgentImpl()); |
91 return false; | 91 return false; |
92 } | 92 } |
93 | 93 |
94 void InspectorClientImpl::attachWindow() | 94 void InspectorClientImpl::attachWindow() |
95 { | 95 { |
96 // FIXME: Implement this | 96 // FIXME: Implement this |
97 } | 97 } |
98 | 98 |
99 void InspectorClientImpl::detachWindow() | 99 void InspectorClientImpl::detachWindow() |
100 { | 100 { |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 } | 253 } |
254 data.append(entry); | 254 data.append(entry); |
255 data.append("\n"); | 255 data.append("\n"); |
256 } | 256 } |
257 m_inspectedWebView->setInspectorSettings(data); | 257 m_inspectedWebView->setInspectorSettings(data); |
258 if (m_inspectedWebView->client()) | 258 if (m_inspectedWebView->client()) |
259 m_inspectedWebView->client()->didUpdateInspectorSettings(); | 259 m_inspectedWebView->client()->didUpdateInspectorSettings(); |
260 } | 260 } |
261 | 261 |
262 } // namespace WebKit | 262 } // namespace WebKit |
OLD | NEW |