diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 18:42:29 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 18:42:29 +0000 |
| commit | 2661b3315141ab6b5dd26cc7ceda43feb77ac519 (patch) | |
| tree | 45d3eb3d455e1aacb7699df662622742ea530d13 /chrome/renderer | |
| parent | 48a70e201c9eb29d11e6b81c5a37eac4fb955476 (diff) | |
| download | chromium_src-2661b3315141ab6b5dd26cc7ceda43feb77ac519.zip chromium_src-2661b3315141ab6b5dd26cc7ceda43feb77ac519.tar.gz chromium_src-2661b3315141ab6b5dd26cc7ceda43feb77ac519.tar.bz2 | |
Eliminate WebViewImpl's dependency on WebDevToolsAgentImpl.
This CL decouples the implementation of WebDevToolsAgent from the
implementation of WebViewImpl. While this allows me to postpone
the uplift of glue/devtools into webkit/api/src, I think it also
has the advantage of simplifying dependencies.
WebDevToolsAgentPrivate is introduced for the method calls made
by the FrameLoaderClientImpl to the WebDevToolsAgentImpl.
R=dglazkov
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/342092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/print_web_view_helper.h | 3 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 10 | ||||
| -rw-r--r-- | chrome/renderer/render_view.h | 1 |
3 files changed, 4 insertions, 10 deletions
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h index 11da15f..c0b3d17 100644 --- a/chrome/renderer/print_web_view_helper.h +++ b/chrome/renderer/print_web_view_helper.h @@ -207,9 +207,6 @@ class PrintWebViewHelper : public WebKit::WebViewClient { virtual void focusAccessibilityObject( const WebKit::WebAccessibilityObject& object) {} virtual void didUpdateInspectorSettings() {} - virtual WebKit::WebDevToolsAgentClient* devToolsAgentClient() { - return NULL; - } virtual void queryAutofillSuggestions( const WebKit::WebNode& node, const WebKit::WebString& name, const WebKit::WebString& value) {} diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 8698211..cd1eb2d 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -66,7 +66,7 @@ #include "skia/ext/image_operations.h" #include "webkit/api/public/WebAccessibilityObject.h" #include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebDevToolsAgentClient.h" +#include "webkit/api/public/WebDevToolsAgent.h" #include "webkit/api/public/WebDragData.h" #include "webkit/api/public/WebForm.h" #include "webkit/api/public/WebFrame.h" @@ -121,7 +121,7 @@ using WebKit::WebConsoleMessage; using WebKit::WebContextMenuData; using WebKit::WebData; using WebKit::WebDataSource; -using WebKit::WebDevToolsAgentClient; +using WebKit::WebDevToolsAgent; using WebKit::WebDragData; using WebKit::WebDragOperation; using WebKit::WebDragOperationsMask; @@ -354,6 +354,8 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd, Singleton<ViewMap>::get()->insert(std::make_pair(webview(), this)); webkit_preferences_.Apply(webview()); webview()->initializeMainFrame(this); + webview()->setDevToolsAgent( + WebDevToolsAgent::create(webview(), devtools_agent_.get())); OnSetRendererPrefs(renderer_prefs); @@ -1707,10 +1709,6 @@ void RenderView::didUpdateInspectorSettings() { routing_id_, webview()->inspectorSettings().utf8())); } -WebDevToolsAgentClient* RenderView::devToolsAgentClient() { - return devtools_agent_.get(); -} - void RenderView::queryAutofillSuggestions(const WebNode& node, const WebString& name, const WebString& value) { diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 65e4975..f2324a1 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -257,7 +257,6 @@ class RenderView : public RenderWidget, virtual void focusAccessibilityObject( const WebKit::WebAccessibilityObject& acc_obj); virtual void didUpdateInspectorSettings(); - virtual WebKit::WebDevToolsAgentClient* devToolsAgentClient(); virtual void queryAutofillSuggestions( const WebKit::WebNode& node, const WebKit::WebString& name, const WebKit::WebString& value); |