Make the cache columns in the Task Manager sortable and only displayed once p...

chrome/browser/cocoa/task_manager_mac.mm

 // Copyright (c) 2009 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/cocoa/task_manager_mac.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/l10n_util_mac.h"
@@ skipping 44 matching lines @@
   [self setUpTableHeaderContextMenu];
 }
 
 // Adds a column which has the given string id as title. |isVisible| specifies
 // if the column is initially visible.
 - (void)addColumnWithId:(int)columnId visible:(BOOL)isVisible {
   scoped_nsobject<NSTableColumn> column([[NSTableColumn alloc]
       initWithIdentifier:[NSNumber numberWithInt:columnId]]);
 
   NSTextAlignment textAlignment = columnId == IDS_TASK_MANAGER_PAGE_COLUMN ?
-      NSLeftTextAlignment : NSRightTextAlignment; 
+      NSLeftTextAlignment : NSRightTextAlignment;
 
   [[column.get() headerCell]
       setStringValue:l10n_util::GetNSStringWithFixup(columnId)];
   [[column.get() headerCell] setAlignment:textAlignment];
   [[column.get() dataCell] setAlignment:textAlignment];
 
   [column.get() setHidden:!isVisible];
   [column.get() setEditable:NO];
   [tableView_ addTableColumn:column.get()];
 }
@@ skipping 42 matching lines @@
   if (![item isKindOfClass:[NSMenuItem class]])
     return;
 
   NSTableColumn* column = [item representedObject];
   DCHECK(column);
   NSInteger oldState = [item state];
   NSInteger newState = oldState == NSOnState ? NSOffState : NSOnState;
   [column setHidden:newState == NSOffState];
   [item setState:newState];
   [tableView_ sizeToFit];
-  [tableView_ setNeedsDisplay];  
+  [tableView_ setNeedsDisplay];
 }
 
 @end
 
 @implementation TaskManagerWindowController (NSTableDataSource)
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView*)tableView {
   DCHECK(tableView == tableView_ || tableView_ == nil);
   return model_->ResourceCount();
 }
@@ skipping 25 matching lines @@
 
     case IDS_TASK_MANAGER_NET_COLUMN:  // Net
       return base::SysWideToNSString(model_->GetResourceNetworkUsage(row));
 
     case IDS_TASK_MANAGER_PROCESS_ID_COLUMN:  // Process ID
       if (!model_->IsResourceFirstInGroup(row))
         return @"";
       return base::SysWideToNSString(model_->GetResourceProcessId(row));
 
     case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN:  // WebCore image cache
+      if (!model_->IsResourceFirstInGroup(row))
+        return @"";
       return base::SysWideToNSString(
           model_->GetResourceWebCoreImageCacheSize(row));
 
     case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN:  // WebCore script cache
+      if (!model_->IsResourceFirstInGroup(row))
+        return @"";
       return base::SysWideToNSString(
           model_->GetResourceWebCoreScriptsCacheSize(row));
 
     case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN:  // WebCore CSS cache
+      if (!model_->IsResourceFirstInGroup(row))
+        return @"";
       return base::SysWideToNSString(
           model_->GetResourceWebCoreCSSCacheSize(row));
 
     case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN:  // Goats Teleported!
       return base::SysWideToNSString(model_->GetResourceGoatsTeleported(row));
 
     default:
       return base::SysWideToNSString(
           model_->GetResourceStatsValue(row, columnId));
   }
@@ skipping 53 matching lines @@
 void TaskManagerMac::Show() {
   if (instance_) {
     // If there's a Task manager window open already, just activate it.
     [[instance_->window_controller_ window]
         makeKeyAndOrderFront:instance_->window_controller_];
   } else {
     instance_ = new TaskManagerMac;
     instance_->model_->StartUpdating();
   }
 }