| Index: content/common/font_list_mac.mm
|
| ===================================================================
|
| --- content/common/font_list_mac.mm (revision 181443)
|
| +++ content/common/font_list_mac.mm (working copy)
|
| @@ -12,19 +12,19 @@
|
|
|
| namespace content {
|
|
|
| -scoped_ptr<ListValue> GetFontList_SlowBlocking() {
|
| +scoped_ptr<base::ListValue> GetFontList_SlowBlocking() {
|
| base::mac::ScopedNSAutoreleasePool autorelease_pool;
|
| - scoped_ptr<ListValue> font_list(new ListValue);
|
| + scoped_ptr<base::ListValue> font_list(new base::ListValue);
|
| NSFontManager* fontManager = [[[NSFontManager alloc] init] autorelease];
|
| NSArray* fonts = [fontManager availableFontFamilies];
|
| for (NSString* family_name in fonts) {
|
| NSString* localized_family_name =
|
| [fontManager localizedNameForFamily:family_name face:nil];
|
| - ListValue* font_item = new ListValue();
|
| + base::ListValue* font_item = new base::ListValue();
|
| string16 family = base::SysNSStringToUTF16(family_name);
|
| - font_item->Append(Value::CreateStringValue(family));
|
| + font_item->Append(new base::StringValue(family));
|
| string16 loc_family = base::SysNSStringToUTF16(localized_family_name);
|
| - font_item->Append(Value::CreateStringValue(loc_family));
|
| + font_item->Append(new base::StringValue(loc_family));
|
| font_list->Append(font_item);
|
| }
|
| return font_list.Pass();
|
|
|