diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 23:17:16 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 23:17:16 +0000 |
| commit | f3add92d73df86fa62bf727b0016e0c62149b326 (patch) | |
| tree | f2d0012dd68061378276814f1c5108e010bda7a5 /chrome/browser/ui/webui/system_info_ui.cc | |
| parent | 13c3497e0bf749e2bf9bb4e0112bf7b1bab63933 (diff) | |
| download | chromium_src-f3add92d73df86fa62bf727b0016e0c62149b326.zip chromium_src-f3add92d73df86fa62bf727b0016e0c62149b326.tar.gz chromium_src-f3add92d73df86fa62bf727b0016e0c62149b326.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/ui/webui/system_info_ui.cc')
| -rw-r--r-- | chrome/browser/ui/webui/system_info_ui.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/system_info_ui.cc b/chrome/browser/ui/webui/system_info_ui.cc index 900f1ab..7d757e5 100644 --- a/chrome/browser/ui/webui/system_info_ui.cc +++ b/chrome/browser/ui/webui/system_info_ui.cc @@ -51,7 +51,7 @@ class SystemInfoUIHTMLSource : public content::URLDataSource{ virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string&) const OVERRIDE { return "text/html"; @@ -105,7 +105,7 @@ std::string SystemInfoUIHTMLSource::GetSource() const { void SystemInfoUIHTMLSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { path_ = path; callback_ = callback; |