diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 16:30:07 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 16:30:07 +0000 |
| commit | a2c04149d7404cb361e588417e38c82008298e92 (patch) | |
| tree | 4ec05299f22544e6948f0f407b96b2512aa7f31f /chrome/renderer | |
| parent | d5a276e97343c5a85c48bbbc9d1218ef943f6707 (diff) | |
| download | chromium_src-a2c04149d7404cb361e588417e38c82008298e92.zip chromium_src-a2c04149d7404cb361e588417e38c82008298e92.tar.gz chromium_src-a2c04149d7404cb361e588417e38c82008298e92.tar.bz2 | |
Revert 50726 "DevTools: Migrate to new WebView initialization (pass devtools client directly)."
Review URL: http://codereview.chromium.org/2871023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r--[-rwxr-xr-x] | chrome/renderer/print_web_view_helper.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index 726ce2d..9bab6a3 100755..100644 --- 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, 0); + print_web_view_ = WebView::create(this); 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 312161b..6b95e29 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -561,12 +561,14 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd, devtools_agent_.reset(new DevToolsAgent(routing_id, this)); - webwidget_ = WebView::create(this, devtools_agent_.get()); + webwidget_ = WebView::create(this); 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); |