Revert 54206 - Mac: Keep groups when sorting task manager, like windows does....

chrome/browser/cocoa/task_manager_mac.mm

 // 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/cocoa/task_manager_mac.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/l10n_util_mac.h"
@@ skipping 42 matching lines @@
 };
 
 class SortHelper {
  public:
   SortHelper(TaskManagerModel* model, NSSortDescriptor* column)
       : sort_column_([[column key] intValue]),
         ascending_([column ascending]),
         model_(model) {}
 
   bool operator()(int a, int b) {
-    std::pair<int, int> group_range1 = model_->GetGroupRangeForResource(a);
-    std::pair<int, int> group_range2 = model_->GetGroupRangeForResource(b);
-    if (group_range1 == group_range2) {
-      // The two rows are in the same group, sort so that items in the same
-      // group always appear in the same order. |ascending_| is intentionally
-      // ignored.
-      return a < b;
-    }
-    // Sort by the first entry of each of the groups.
-    int cmp_result = model_->CompareValues(
-        group_range1.first, group_range2.first, sort_column_);
+    int cmp_result = model_->CompareValues(a, b, sort_column_ );
     if (!ascending_)
       cmp_result = -cmp_result;
+    // TODO(thakis): Do grouping like on GTK.
     return cmp_result < 0;
   }
  private:
   int sort_column_;
   bool ascending_;
   TaskManagerModel* model_;  // weak;
 };
 
 }  // namespace
 
@@ skipping 326 matching lines @@
                        row:(NSInteger)rowIndex {
   NSCell* cell = [tableColumn dataCellForRow:rowIndex];
 
   // Set the favicon and title for the task in the name column.
   if ([[tableColumn identifier] intValue] == IDS_TASK_MANAGER_PAGE_COLUMN) {
     DCHECK([cell isKindOfClass:[NSButtonCell class]]);
     NSButtonCell* buttonCell = static_cast<NSButtonCell*>(cell);
     NSString* title = [self modelTextForRow:rowIndex
                                     column:[[tableColumn identifier] intValue]];
     [buttonCell setTitle:title];
-    [buttonCell setImage:
-        taskManagerObserver_->GetImageForRow(indexShuffle_[rowIndex])];
+    [buttonCell setImage:taskManagerObserver_->GetImageForRow(rowIndex)];
     [buttonCell setRefusesFirstResponder:YES];  // Don't push in like a button.
     [buttonCell setHighlightsBy:NSNoCellMask];
   }
 
   return cell;
 }
 
 - (void)           tableView:(NSTableView*)tableView
     sortDescriptorsDidChange:(NSArray*)oldDescriptors {
   NSArray* newDescriptors = [tableView sortDescriptors];
@@ skipping 69 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(TaskManager::GetInstance());
     instance_->model_->StartUpdating();
   }
 }