From f3add92d73df86fa62bf727b0016e0c62149b326 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Fri, 20 Dec 2013 23:17:16 +0000 Subject: A bunch of work to transition from render_view_id to render_frame_id. -remove ResourceRequestInfo::GetRenderViewForRequest -reduce usage of GetAssociatedRenderView and add GetAssociatedRenderFrame which will replace it -move the cookie jar from RenderView to RenderFrame -switch most of the usages of RenderView to RenderFrame in WebPluginImpl BUG=304341 R=boliu@chromium.org, nasko@chromium.org Review URL: https://codereview.chromium.org/114573003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242200 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/webui/web_ui_data_source_impl.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'content/browser/webui/web_ui_data_source_impl.cc') diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc index 6775eb7..d6cff75 100644 --- a/content/browser/webui/web_ui_data_source_impl.cc +++ b/content/browser/webui/web_ui_data_source_impl.cc @@ -44,9 +44,9 @@ class WebUIDataSourceImpl::InternalDataSource : public URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const URLDataSource::GotDataCallback& callback) OVERRIDE { - return parent_->StartDataRequest(path, render_process_id, render_view_id, + return parent_->StartDataRequest(path, render_process_id, render_frame_id, callback); } virtual bool ShouldReplaceExistingSource() const OVERRIDE { @@ -188,7 +188,7 @@ std::string WebUIDataSourceImpl::GetMimeType(const std::string& path) const { void WebUIDataSourceImpl::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const URLDataSource::GotDataCallback& callback) { if (!filter_callback_.is_null() && filter_callback_.Run(path, callback)) { -- cgit v1.1