summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 11:46:49 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 11:46:49 +0000
commit9a6c623d98ef93ef571821f219b4fe24bfa56e7f (patch)
tree5a7c81e3d28c3d26387ffbeac9f65c6d3ae6565a /chrome/renderer
parent2863f99e4ec90a23098d3e4de1861e67395ffa2a (diff)
downloadchromium_src-9a6c623d98ef93ef571821f219b4fe24bfa56e7f.zip
chromium_src-9a6c623d98ef93ef571821f219b4fe24bfa56e7f.tar.gz
chromium_src-9a6c623d98ef93ef571821f219b4fe24bfa56e7f.tar.bz2
DevTools: migrate to new WebView constructor.
Review URL: http://codereview.chromium.org/2814033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/print_web_view_helper.cc2
-rw-r--r--chrome/renderer/render_view.cc4
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
--- 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 be49bbf..2d517a7 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);