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

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

Issue 6044007: Remove wstring from TableModel.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years 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
Index: chrome/browser/ui/cocoa/table_model_array_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/table_model_array_controller.mm (revision 70272)
+++ chrome/browser/ui/cocoa/table_model_array_controller.mm (working copy)
@@ -83,7 +83,7 @@
for (TableModel::Groups::const_iterator it = groups.begin();
it != groups.end(); ++it) {
NSDictionary* group = [NSDictionary dictionaryWithObjectsAndKeys:
- base::SysWideToNSString(it->title), groupTitle_.get(),
+ base::SysUTF16ToNSString(it->title), groupTitle_.get(),
[NSNumber numberWithBool:YES], kIsGroupRow,
nil];
[self addObject:group];
@@ -191,8 +191,8 @@
}
for (NSString* identifier in columns_.get()) {
int column_id = [[columns_ objectForKey:identifier] intValue];
- std::wstring text = model_->GetText(row, column_id);
- [dict setObject:base::SysWideToNSString(text) forKey:identifier];
+ string16 text = model_->GetText(row, column_id);
+ [dict setObject:base::SysUTF16ToNSString(text) forKey:identifier];
}
return dict;
}

Powered by Google App Engine
This is Rietveld 408576698