| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/options/font_settings_utils.h" | 5 #include "chrome/browser/ui/webui/options/font_settings_utils.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/mac/scoped_nsautorelease_pool.h" | 9 #include "base/mac/scoped_nsautorelease_pool.h" |
| 10 #include "base/sys_string_conversions.h" | 10 #include "base/sys_string_conversions.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 base::SysUTF8ToNSString(prefs->GetString(family_pref_name)); | 23 base::SysUTF8ToNSString(prefs->GetString(family_pref_name)); |
| 24 NSFont *font = [NSFont fontWithName:family_name | 24 NSFont *font = [NSFont fontWithName:family_name |
| 25 size:[NSFont systemFontSize]]; | 25 size:[NSFont systemFontSize]]; |
| 26 if (font && | 26 if (font && |
| 27 [[font familyName] caseInsensitiveCompare:family_name] != NSOrderedSame) { | 27 [[font familyName] caseInsensitiveCompare:family_name] != NSOrderedSame) { |
| 28 std::string new_family_name = base::SysNSStringToUTF8([font familyName]); | 28 std::string new_family_name = base::SysNSStringToUTF8([font familyName]); |
| 29 prefs->SetString(family_pref_name, new_family_name); | 29 prefs->SetString(family_pref_name, new_family_name); |
| 30 } | 30 } |
| 31 } | 31 } |
| 32 | 32 |
| 33 ListValue* FontSettingsUtilities::GetFontsList() { | 33 // static |
| 34 base::mac::ScopedNSAutoreleasePool autorelease_pool; | |
| 35 ListValue* font_list = new ListValue; | |
| 36 NSFontManager* fontManager = [[[NSFontManager alloc] init] autorelease]; | |
| 37 NSArray* fonts = [fontManager availableFontFamilies]; | |
| 38 for (NSString* family_name in fonts) { | |
| 39 NSString* localized_family_name = | |
| 40 [fontManager localizedNameForFamily:family_name face:nil]; | |
| 41 ListValue* font_item = new ListValue(); | |
| 42 string16 family = base::SysNSStringToUTF16(family_name); | |
| 43 font_item->Append(Value::CreateStringValue(family)); | |
| 44 string16 loc_family = base::SysNSStringToUTF16(localized_family_name); | |
| 45 font_item->Append(Value::CreateStringValue(loc_family)); | |
| 46 font_list->Append(font_item); | |
| 47 } | |
| 48 return font_list; | |
| 49 } | |
| 50 | |
| 51 void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) { | 34 void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) { |
| 52 ValidateFontFamily(prefs, prefs::kWebKitSerifFontFamily); | 35 ValidateFontFamily(prefs, prefs::kWebKitSerifFontFamily); |
| 53 ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily); | 36 ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily); |
| 54 ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily); | 37 ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily); |
| 55 } | 38 } |
| OLD | NEW |