Implement new task manager mocks on windows.

chrome/browser/task_manager/task_manager.cc

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 2080b343f2f720e8d53cfa0ac1172dac27ab8679..deed01cea69e753d5d4683a8fd404c3125d9cb8c 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -78,14 +78,14 @@ TaskManagerModel::TaskManagerModel(TaskManager* task_manager)
       new TaskManagerBrowserProcessResourceProvider(task_manager);
   browser_provider->AddRef();
   providers_.push_back(browser_provider);
-  TaskManagerTabContentsResourceProvider* wc_provider =
-      new TaskManagerTabContentsResourceProvider(task_manager);
-  wc_provider->AddRef();
-  providers_.push_back(wc_provider);
   TaskManagerBackgroundContentsResourceProvider* bc_provider =
       new TaskManagerBackgroundContentsResourceProvider(task_manager);
   bc_provider->AddRef();
   providers_.push_back(bc_provider);
+    TaskManagerTabContentsResourceProvider* wc_provider =

[Evan Stade, 2010/11/15 03:54:00]

indent weird.

why did you move this?

[Andrew T Wilson (Slow), 2010/11/15 08:20:57]

The order the providers are defined also defines the order in which resources
within a given process are displayed in the task manager. I want background
pages to show up first in the list for each background process, so I moved the
BackgroundContents provider before the other providers.

I fixed the indent.

+      new TaskManagerTabContentsResourceProvider(task_manager);
+  wc_provider->AddRef();
+  providers_.push_back(wc_provider);
   TaskManagerChildProcessResourceProvider* child_process_provider =
       new TaskManagerChildProcessResourceProvider(task_manager);
   child_process_provider->AddRef();
@@ -252,6 +252,11 @@ bool TaskManagerModel::IsResourceFirstInGroup(int index) const {
   return ((*group)[0] == resource);
 }
 
+bool TaskManagerModel::IsBackgroundResource(int index) const {
+  CHECK(index < ResourceCount());

[Evan Stade, 2010/11/15 03:54:00]

is there no CHECK_LT?

[Andrew T Wilson (Slow), 2010/11/15 08:20:57]

There is - I was just following the pattern used in other functions in this
file, but I'll change all the instances to use CHECK_LT.

+  return resources_[index]->IsBackground();
+}
+
 SkBitmap TaskManagerModel::GetResourceIcon(int index) const {
   CHECK(index < ResourceCount());
   SkBitmap icon = resources_[index]->GetIcon();
@@ -611,7 +616,7 @@ void TaskManagerModel::AddResource(TaskManager::Resource* resource) {
                   resources_.end(),
                   (*group_entries)[group_entries->size() - 2]);
     DCHECK(iter != resources_.end());
-    new_entry_index = static_cast<int>(iter - resources_.begin());
+    new_entry_index = static_cast<int>(iter - resources_.begin()) + 1;
     resources_.insert(++iter, resource);
   }
 
@@ -715,6 +720,12 @@ void TaskManagerModel::Clear() {
   }
 }
 
+void TaskManagerModel::ModelChanged() {
+  // Notify the table that the contents have changed for it to redraw.
+  FOR_EACH_OBSERVER(TaskManagerModelObserver, observer_list_,

[Evan Stade, 2010/11/15 03:54:00]

can this all fit on one row?

[Andrew T Wilson (Slow), 2010/11/15 08:20:57]

Wow, it just fit. Good eye.

+                    OnModelChanged());
+}
+
 void TaskManagerModel::NotifyResourceTypeStats(
     base::ProcessId renderer_id,
     const WebKit::WebCache::ResourceTypeStats& stats) {
@@ -966,6 +977,10 @@ void TaskManager::OnWindowClosed() {
   model_->StopUpdating();
 }
 
+void TaskManager::ModelChanged() {
+  model_->ModelChanged();
+}
+
 // static
 TaskManager* TaskManager::GetInstance() {
   return Singleton<TaskManager>::get();