Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: chrome/browser/task_manager/web_contents_resource_provider.cc

Issue 231853005: Fix task manager behavior for tabs that are killed/restarted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add OVERRIDE Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/task_manager/task_manager_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/task_manager/web_contents_resource_provider.h" 5 #include "chrome/browser/task_manager/web_contents_resource_provider.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/prerender/prerender_manager.h" 10 #include "chrome/browser/prerender/prerender_manager.h"
(...skipping 24 matching lines...) Expand all
35 WebContentsResourceProvider* provider) 35 WebContentsResourceProvider* provider)
36 : content::WebContentsObserver(web_contents), provider_(provider) {} 36 : content::WebContentsObserver(web_contents), provider_(provider) {}
37 37
38 // content::WebContentsObserver implementation. 38 // content::WebContentsObserver implementation.
39 virtual void RenderViewHostChanged(RenderViewHost* old_host, 39 virtual void RenderViewHostChanged(RenderViewHost* old_host,
40 RenderViewHost* new_host) OVERRIDE { 40 RenderViewHost* new_host) OVERRIDE {
41 provider_->RemoveFromTaskManager(web_contents()); 41 provider_->RemoveFromTaskManager(web_contents());
42 provider_->AddToTaskManager(web_contents()); 42 provider_->AddToTaskManager(web_contents());
43 } 43 }
44 44
45 virtual void RenderViewReady() OVERRIDE {
46 provider_->RemoveFromTaskManager(web_contents());
47 provider_->AddToTaskManager(web_contents());
48 }
49
50 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE {
51 provider_->RemoveFromTaskManager(web_contents());
52 }
53
45 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE { 54 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE {
46 provider_->RemoveFromTaskManager(web_contents); 55 provider_->RemoveFromTaskManager(web_contents);
47 provider_->DeleteObserver(this); // Deletes |this|. 56 provider_->DeleteObserver(this); // Deletes |this|.
48 } 57 }
49 58
50 private: 59 private:
51 WebContentsResourceProvider* provider_; 60 WebContentsResourceProvider* provider_;
52 }; 61 };
53 62
54 //////////////////////////////////////////////////////////////////////////////// 63 ////////////////////////////////////////////////////////////////////////////////
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 void WebContentsResourceProvider::DeleteObserver( 186 void WebContentsResourceProvider::DeleteObserver(
178 TaskManagerWebContentsObserver* observer) { 187 TaskManagerWebContentsObserver* observer) {
179 if (!web_contents_observers_.erase(observer)) { 188 if (!web_contents_observers_.erase(observer)) {
180 NOTREACHED(); 189 NOTREACHED();
181 return; 190 return;
182 } 191 }
183 delete observer; // Typically, this is our caller. Deletion is okay. 192 delete observer; // Typically, this is our caller. Deletion is okay.
184 } 193 }
185 194
186 } // namespace task_manager 195 } // namespace task_manager
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/task_manager_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698