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

Unified Diff: chrome/browser/cocoa/task_manager_mac.h

Issue 2873075: Mac: Add sort support for task manager. (Closed)
Patch Set: comments Created 10 years, 5 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 | « no previous file | chrome/browser/cocoa/task_manager_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/task_manager_mac.h
diff --git a/chrome/browser/cocoa/task_manager_mac.h b/chrome/browser/cocoa/task_manager_mac.h
index 282cdb1923251e0aa20eb31b75d45a47a1f6aa10..6d57f82598a34290cfcd5dbb4a6b841ecf3287b4 100644
--- a/chrome/browser/cocoa/task_manager_mac.h
+++ b/chrome/browser/cocoa/task_manager_mac.h
@@ -7,6 +7,8 @@
#pragma once
#import <Cocoa/Cocoa.h>
+#include <vector>
+
#include "base/scoped_nsobject.h"
#include "chrome/browser/cocoa/table_row_nsimage_cache.h"
#include "chrome/browser/task_manager.h"
@@ -25,6 +27,13 @@ class TaskManagerMac;
TaskManagerModel* model_; // weak
scoped_nsobject<WindowSizeAutosaver> size_saver_;
+
+ // Contains a permutation of [0..|model_->ResourceCount() - 1|]. Used to
+ // implement sorting.
+ std::vector<int> indexShuffle_;
+
+ // Descriptor of the current sort column.
+ scoped_nsobject<NSSortDescriptor> currentSortDescriptor_;
}
// Creates and shows the task manager's window.
@@ -43,11 +52,15 @@ class TaskManagerMac;
- (void)selectDoubleClickedTab:(id)sender;
@end
+@interface TaskManagerWindowController (TestingAPI)
+- (NSTableView*)tableView;
+@end
+
// This class listens to task changed events sent by chrome.
class TaskManagerMac : public TaskManagerModelObserver,
public TableRowNSImageCache::Table {
public:
- TaskManagerMac();
+ TaskManagerMac(TaskManager* task_manager);
virtual ~TaskManagerMac();
// TaskManagerModelObserver
@@ -74,9 +87,11 @@ class TaskManagerMac : public TaskManagerModelObserver,
// Lazily converts the image at the given row and caches it in |icon_cache_|.
NSImage* GetImageForRow(int row);
+ // Returns the cocoa object. Used for testing.
+ TaskManagerWindowController* cocoa_controller() { return window_controller_; }
private:
// The task manager.
- TaskManager* const task_manager_; // weak
+ TaskManager* const task_manager_; // weak
// Our model.
TaskManagerModel* const model_; // weak
« no previous file with comments | « no previous file | chrome/browser/cocoa/task_manager_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698