diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 16:11:28 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 16:11:28 +0000 |
| commit | d5a276e97343c5a85c48bbbc9d1218ef943f6707 (patch) | |
| tree | 04b0a3ce704406a7719e15e42e6450b2a4080465 /chrome | |
| parent | 176ac084a381538e4f904f936d085fb42c3cf15c (diff) | |
| download | chromium_src-d5a276e97343c5a85c48bbbc9d1218ef943f6707.zip chromium_src-d5a276e97343c5a85c48bbbc9d1218ef943f6707.tar.gz chromium_src-d5a276e97343c5a85c48bbbc9d1218ef943f6707.tar.bz2 | |
DevTools: Migrate to new WebView initialization (pass devtools client directly).
Review URL: http://codereview.chromium.org/2864020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rwxr-xr-x[-rw-r--r--] | chrome/renderer/print_web_view_helper.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index 9bab6a3..726ce2d 100644..100755 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -246,7 +246,7 @@ bool PrintWebViewHelper::CopyAndPrint(const ViewMsg_PrintPages_Params& params, prefs.javascript_enabled = false; prefs.java_enabled = false; - print_web_view_ = WebView::create(this); + print_web_view_ = WebView::create(this, 0); prefs.Apply(print_web_view_); print_web_view_->initializeMainFrame(this); diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 6b95e29..312161b 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -561,14 +561,12 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd, devtools_agent_.reset(new DevToolsAgent(routing_id, this)); - webwidget_ = WebView::create(this); + webwidget_ = WebView::create(this, devtools_agent_.get()); Singleton<ViewMap>::get()->insert(std::make_pair(webview(), this)); webkit_preferences_.Apply(webview()); webview()->initializeMainFrame(this); if (!frame_name.empty()) webview()->mainFrame()->setName(frame_name); - webview()->setDevToolsAgent( - WebDevToolsAgent::create(webview(), devtools_agent_.get())); OnSetRendererPrefs(renderer_prefs); |