diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 18:07:50 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 18:07:50 +0000 |
| commit | 844f3df9c0726363644c98981a20af9bbc7672b7 (patch) | |
| tree | adbc1453697930ff3d029cf2eb377d01f5bbb31f /chrome/browser/task_manager/renderer_resource.cc | |
| parent | dccfe9c0188f80d4127dfd73781289c0dde77e98 (diff) | |
| download | chromium_src-844f3df9c0726363644c98981a20af9bbc7672b7.zip chromium_src-844f3df9c0726363644c98981a20af9bbc7672b7.tar.gz chromium_src-844f3df9c0726363644c98981a20af9bbc7672b7.tar.bz2 | |
Fix the browser crash that occurred in RendererResource. This was caused by r129574, since that made it possible for background pages opened by window.open switch RenderViewHosts. BackgroundContentsResourceProvider just needs to be updated to handle this case, similar to TabContentsResourceProvider.
With this fix, we can remove the temporary code added in r186502 as part of removing RenderViewHostObserver.
BUG=306569,165138
R=creis@chromium.org
Review URL: https://codereview.chromium.org/29693009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager/renderer_resource.cc')
| -rw-r--r-- | chrome/browser/task_manager/renderer_resource.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/task_manager/renderer_resource.cc b/chrome/browser/task_manager/renderer_resource.cc index cc66efb..51d3765 100644 --- a/chrome/browser/task_manager/renderer_resource.cc +++ b/chrome/browser/task_manager/renderer_resource.cc @@ -15,8 +15,7 @@ namespace task_manager { RendererResource::RendererResource(base::ProcessHandle process, content::RenderViewHost* render_view_host) - : content::RenderViewHostObserver(render_view_host), - process_(process), + : process_(process), render_view_host_(render_view_host), pending_stats_update_(false), fps_(0.0f), @@ -125,11 +124,4 @@ bool RendererResource::SupportNetworkUsage() const { return true; } -void RendererResource::RenderViewHostDestroyed( - content::RenderViewHost* render_view_host) { - // We should never get here. We should get deleted first. - // Use this CHECK to help diagnose http://crbug.com/165138. - CHECK(false); -} - } // namespace task_manager |