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

Unified Diff: chrome/browser/task_manager/task_manager.cc

Issue 10533070: TabContentsWrapper -> TabContents, part 31. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/task_manager/task_manager.h ('k') | chrome/browser/task_manager/task_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/task_manager/task_manager.cc
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index d916567418847964a5930ba51d8032d2b58874c4..186c08301a4a756f0d659aa7dcf35d2f1337b865 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -25,7 +25,7 @@
#include "chrome/browser/task_manager/task_manager_worker_resource_provider.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_navigator.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "chrome/common/view_type.h"
@@ -481,7 +481,7 @@ TaskManager::Resource::Type TaskManagerModel::GetResourceType(int index) const {
return resources_[index]->GetType();
}
-TabContentsWrapper* TaskManagerModel::GetResourceTabContents(int index) const {
+TabContents* TaskManagerModel::GetResourceTabContents(int index) const {
CHECK_LT(index, ResourceCount());
return resources_[index]->GetTabContents();
}
@@ -1098,8 +1098,7 @@ void TaskManager::ActivateProcess(int index) {
// GetResourceTabContents returns a pointer to the relevant tab contents for
// the resource. If the index doesn't correspond to a Tab (i.e. refers to
// the Browser process or a plugin), GetTabContents will return NULL.
- TabContentsWrapper* chosen_tab_contents =
- model_->GetResourceTabContents(index);
+ TabContents* chosen_tab_contents = model_->GetResourceTabContents(index);
if (chosen_tab_contents) {
WebContents* web_contents = chosen_tab_contents->web_contents();
web_contents->GetDelegate()->ActivateContents(web_contents);
« no previous file with comments | « chrome/browser/task_manager/task_manager.h ('k') | chrome/browser/task_manager/task_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698