Implement new task manager mocks on windows.

chrome/browser/task_manager/task_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_manager/task_manager.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 60 matching lines @@
 
 TaskManagerModel::TaskManagerModel(TaskManager* task_manager)
     : update_requests_(0),
       update_state_(IDLE),
       goat_salt_(rand()) {
 
   TaskManagerBrowserProcessResourceProvider* browser_provider =
       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();
   providers_.push_back(child_process_provider);
   TaskManagerExtensionProcessResourceProvider* extension_process_provider =
       new TaskManagerExtensionProcessResourceProvider(task_manager);
   extension_process_provider->AddRef();
   providers_.push_back(extension_process_provider);
   TaskManagerNotificationResourceProvider* notification_provider =
       new TaskManagerNotificationResourceProvider(task_manager);
@@ skipping 146 matching lines @@
 
 bool TaskManagerModel::IsResourceFirstInGroup(int index) const {
   CHECK(index < ResourceCount());
   TaskManager::Resource* resource = resources_[index];
   GroupMap::const_iterator iter = group_map_.find(resource->GetProcess());
   DCHECK(iter != group_map_.end());
   const ResourceList* group = iter->second;
   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();
   if (!icon.isNull())
     return icon;
 
   static SkBitmap* default_icon = ResourceBundle::GetSharedInstance().
       GetBitmapNamed(IDR_DEFAULT_FAVICON);
   return *default_icon;
 }
@@ skipping 339 matching lines @@
   } else {
     group_entries = group_iter->second;
     group_entries->push_back(resource);
 
     // Insert the new entry right after the last entry of its group.
     ResourceList::iterator iter =
         std::find(resources_.begin(),
                   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);
   }
 
   // Create the ProcessMetrics for this process if needed (not in map).
   if (metrics_map_.find(process) == metrics_map_.end()) {
     base::ProcessMetrics* pm =
 #if !defined(OS_MACOSX)
         base::ProcessMetrics::CreateProcessMetrics(process);
 #else
         base::ProcessMetrics::CreateProcessMetrics(process,
@@ skipping 83 matching lines @@
 
     // Clear the network maps.
     current_byte_count_map_.clear();
     displayed_network_usage_map_.clear();
 
     FOR_EACH_OBSERVER(TaskManagerModelObserver, observer_list_,
                       OnItemsRemoved(0, size));
   }
 }
 
+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) {
   for (ResourceList::iterator it = resources_.begin();
        it != resources_.end(); ++it) {
     if (base::GetProcId((*it)->GetProcess()) == renderer_id) {
       (*it)->NotifyResourceTypeStats(stats);
     }
   }
 }
@@ skipping 231 matching lines @@
 }
 
 void TaskManager::RemoveResource(Resource* resource) {
   model_->RemoveResource(resource);
 }
 
 void TaskManager::OnWindowClosed() {
   model_->StopUpdating();
 }
 
+void TaskManager::ModelChanged() {
+  model_->ModelChanged();
+}
+
 // static
 TaskManager* TaskManager::GetInstance() {
   return Singleton<TaskManager>::get();
 }
 
 void TaskManager::OpenAboutMemory() {
   Browser* browser = BrowserList::GetLastActive();
 
   if (!browser) {
     // On OS X, the task manager can be open without any open browser windows.
@@ skipping 31 matching lines @@
   MetricsMap::const_iterator iter = metrics_map_.find(handle);
   if (iter == metrics_map_.end())
     return false;
 
   if (!iter->second->GetMemoryBytes(&usage->first, &usage->second))
     return false;
 
   memory_usage_map_.insert(std::make_pair(handle, *usage));
   return true;
 }