diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 16:35:38 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 16:35:38 +0000 |
| commit | 2b2d9393845b8bb60f843d14ab0b59c4bc3949db (patch) | |
| tree | 05f52d2c1499442e5ec8d7d95a5ed93701e68e00 | |
| parent | 84829155dbdced379f556070ebf51c4126235dfd (diff) | |
| download | chromium_src-2b2d9393845b8bb60f843d14ab0b59c4bc3949db.zip chromium_src-2b2d9393845b8bb60f843d14ab0b59c4bc3949db.tar.gz chromium_src-2b2d9393845b8bb60f843d14ab0b59c4bc3949db.tar.bz2 | |
mac: -[NSTableColumn initWithIdentifier:] takes NSString instead of id with the 10.7 sdk.
BUG=136844
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10826027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148562 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/task_manager_mac.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/cocoa/task_manager_mac_unittest.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm index 94d3d3d..3f622c1 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac.mm @@ -223,7 +223,7 @@ class SortHelper { // if the column is initially visible. - (NSTableColumn*)addColumnWithId:(int)columnId visible:(BOOL)isVisible { scoped_nsobject<NSTableColumn> column([[NSTableColumn alloc] - initWithIdentifier:[NSNumber numberWithInt:columnId]]); + initWithIdentifier:[NSString stringWithFormat:@"%d", columnId]]); NSTextAlignment textAlignment = (columnId == IDS_TASK_MANAGER_TASK_COLUMN || diff --git a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm index 8d3b8f3..54d8dfc 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm @@ -71,7 +71,7 @@ TEST_F(TaskManagerWindowControllerTest, Sort) { // Test that table is sorted on title. NSTableColumn* title_column = [table tableColumnWithIdentifier: - [NSNumber numberWithInt:IDS_TASK_MANAGER_TASK_COLUMN]]; + [NSString stringWithFormat:@"%d", IDS_TASK_MANAGER_TASK_COLUMN]]; NSCell* cell; cell = [controller tableView:table dataCellForTableColumn:title_column row:0]; EXPECT_NSEQ(@"zzb", [cell title]); |