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

Unified Diff: chrome/browser/ui/cocoa/task_manager_mac.mm

Issue 9958109: TaskManager: Replace the string "Page" with "Task" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | « chrome/browser/task_manager/task_manager.cc ('k') | chrome/browser/ui/cocoa/task_manager_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/task_manager_mac.mm
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm
index de511ba3bb65bc000465368ed93da03f7ef90425..cc31e27e1b1515154e406e41146275af2d16c614 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac.mm
+++ b/chrome/browser/ui/cocoa/task_manager_mac.mm
@@ -31,7 +31,7 @@ const struct ColumnWidth {
int maxWidth; // If this is -1, 1.5*minColumWidth is used as max width.
} columnWidths[] = {
// Note that arraysize includes the trailing \0. That's intended.
- { IDS_TASK_MANAGER_PAGE_COLUMN, 120, 600 },
+ { IDS_TASK_MANAGER_TASK_COLUMN, 120, 600 },
{ IDS_TASK_MANAGER_PROFILE_NAME_COLUMN, 60, 200 },
{ IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN,
arraysize("800 MiB") * kCharWidth, -1 },
@@ -225,7 +225,7 @@ class SortHelper {
initWithIdentifier:[NSNumber numberWithInt:columnId]]);
NSTextAlignment textAlignment =
- (columnId == IDS_TASK_MANAGER_PAGE_COLUMN ||
+ (columnId == IDS_TASK_MANAGER_TASK_COLUMN ||
columnId == IDS_TASK_MANAGER_PROFILE_NAME_COLUMN) ?
NSLeftTextAlignment : NSRightTextAlignment;
@@ -241,7 +241,7 @@ class SortHelper {
[column.get() setEditable:NO];
// The page column should by default be sorted ascending.
- BOOL ascending = columnId == IDS_TASK_MANAGER_PAGE_COLUMN;
+ BOOL ascending = columnId == IDS_TASK_MANAGER_TASK_COLUMN;
scoped_nsobject<NSSortDescriptor> sortDescriptor([[NSSortDescriptor alloc]
initWithKey:[NSString stringWithFormat:@"%d", columnId]
@@ -276,7 +276,7 @@ class SortHelper {
- (void)setUpTableColumns {
for (NSTableColumn* column in [tableView_ tableColumns])
[tableView_ removeTableColumn:column];
- NSTableColumn* nameColumn = [self addColumnWithId:IDS_TASK_MANAGER_PAGE_COLUMN
+ NSTableColumn* nameColumn = [self addColumnWithId:IDS_TASK_MANAGER_TASK_COLUMN
visible:YES];
// |nameColumn| displays an icon for every row -- this is done by an
// NSButtonCell.
@@ -432,7 +432,7 @@ class SortHelper {
DCHECK_LT(static_cast<size_t>(row), viewToModelMap_.size());
row = viewToModelMap_[row];
switch (columnId) {
- case IDS_TASK_MANAGER_PAGE_COLUMN: // Process
+ case IDS_TASK_MANAGER_TASK_COLUMN: // Process
return base::SysUTF16ToNSString(model_->GetResourceTitle(row));
case IDS_TASK_MANAGER_PROFILE_NAME_COLUMN: // Profile Name
@@ -513,7 +513,7 @@ class SortHelper {
row:(NSInteger)rowIndex {
// NSButtonCells expect an on/off state as objectValue. Their title is set
// in |tableView:dataCellForTableColumn:row:| below.
- if ([[tableColumn identifier] intValue] == IDS_TASK_MANAGER_PAGE_COLUMN) {
+ if ([[tableColumn identifier] intValue] == IDS_TASK_MANAGER_TASK_COLUMN) {
return [NSNumber numberWithInt:NSOffState];
}
@@ -527,7 +527,7 @@ class SortHelper {
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) {
+ if ([[tableColumn identifier] intValue] == IDS_TASK_MANAGER_TASK_COLUMN) {
DCHECK([cell isKindOfClass:[NSButtonCell class]]);
NSButtonCell* buttonCell = static_cast<NSButtonCell*>(cell);
NSString* title = [self modelTextForRow:rowIndex
« no previous file with comments | « chrome/browser/task_manager/task_manager.cc ('k') | chrome/browser/ui/cocoa/task_manager_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698