Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: webkit/api/src/InspectorClientImpl.cpp

Issue 342092: Eliminate WebViewImpl's dependency on WebDevToolsAgentImpl.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/api/src/FrameLoaderClientImpl.cpp ('k') | webkit/api/src/WebDevToolsAgentPrivate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 26 matching lines...) Expand all
37 #include "NotImplemented.h" 37 #include "NotImplemented.h"
38 #include "Page.h" 38 #include "Page.h"
39 #include "Settings.h" 39 #include "Settings.h"
40 #include "WebRect.h" 40 #include "WebRect.h"
41 #include "WebURL.h" 41 #include "WebURL.h"
42 #include "WebURLRequest.h" 42 #include "WebURLRequest.h"
43 #include "WebViewClient.h" 43 #include "WebViewClient.h"
44 #include "WebViewImpl.h" 44 #include "WebViewImpl.h"
45 #include <wtf/Vector.h> 45 #include <wtf/Vector.h>
46 46
47 // FIXME: Remove this once WebDevToolsAgentImpl and WebViewImpl move out of glue/.
48 #include "webkit/glue/webdevtoolsagent_impl.h"
49
50 using namespace WebCore; 47 using namespace WebCore;
51 48
52 namespace WebKit { 49 namespace WebKit {
53 50
54 InspectorClientImpl::InspectorClientImpl(WebViewImpl* webView) 51 InspectorClientImpl::InspectorClientImpl(WebViewImpl* webView)
55 : m_inspectedWebView(webView) 52 : m_inspectedWebView(webView)
56 { 53 {
57 ASSERT(m_inspectedWebView); 54 ASSERT(m_inspectedWebView);
58 } 55 }
59 56
60 InspectorClientImpl::~InspectorClientImpl() 57 InspectorClientImpl::~InspectorClientImpl()
61 { 58 {
62 } 59 }
63 60
64 void InspectorClientImpl::inspectorDestroyed() 61 void InspectorClientImpl::inspectorDestroyed()
65 { 62 {
66 // Our lifetime is bound to the WebViewImpl. 63 // Our lifetime is bound to the WebViewImpl.
67 } 64 }
68 65
69 Page* InspectorClientImpl::createPage() 66 Page* InspectorClientImpl::createPage()
70 { 67 {
71 // This method should never be called in Chrome as inspector front-end lives 68 // This method should never be called in Chrome as inspector front-end lives
72 // in a separate process. 69 // in a separate process.
73 ASSERT_NOT_REACHED(); 70 ASSERT_NOT_REACHED();
74 return 0; 71 return 0;
75 } 72 }
76 73
77 void InspectorClientImpl::showWindow() 74 void InspectorClientImpl::showWindow()
78 { 75 {
79 ASSERT(m_inspectedWebView->devToolsAgentImpl()); 76 ASSERT(m_inspectedWebView->devToolsAgentPrivate());
80 m_inspectedWebView->page()->inspectorController()->setWindowVisible(true); 77 m_inspectedWebView->page()->inspectorController()->setWindowVisible(true);
81 } 78 }
82 79
83 void InspectorClientImpl::closeWindow() 80 void InspectorClientImpl::closeWindow()
84 { 81 {
85 if (m_inspectedWebView->page()) 82 if (m_inspectedWebView->page())
86 m_inspectedWebView->page()->inspectorController()->setWindowVisible(false); 83 m_inspectedWebView->page()->inspectorController()->setWindowVisible(false);
87 } 84 }
88 85
89 bool InspectorClientImpl::windowVisible() 86 bool InspectorClientImpl::windowVisible()
90 { 87 {
91 ASSERT(m_inspectedWebView->devToolsAgentImpl()); 88 ASSERT(m_inspectedWebView->devToolsAgentPrivate());
92 return false; 89 return false;
93 } 90 }
94 91
95 void InspectorClientImpl::attachWindow() 92 void InspectorClientImpl::attachWindow()
96 { 93 {
97 // FIXME: Implement this 94 // FIXME: Implement this
98 } 95 }
99 96
100 void InspectorClientImpl::detachWindow() 97 void InspectorClientImpl::detachWindow()
101 { 98 {
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 } 251 }
255 data.append(entry); 252 data.append(entry);
256 data.append("\n"); 253 data.append("\n");
257 } 254 }
258 m_inspectedWebView->setInspectorSettings(data); 255 m_inspectedWebView->setInspectorSettings(data);
259 if (m_inspectedWebView->client()) 256 if (m_inspectedWebView->client())
260 m_inspectedWebView->client()->didUpdateInspectorSettings(); 257 m_inspectedWebView->client()->didUpdateInspectorSettings();
261 } 258 }
262 259
263 } // namespace WebKit 260 } // namespace WebKit
OLDNEW
« no previous file with comments | « webkit/api/src/FrameLoaderClientImpl.cpp ('k') | webkit/api/src/WebDevToolsAgentPrivate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698