Chromium Code Reviews| Index: content/common/font_list_mac.mm |
| =================================================================== |
| --- content/common/font_list_mac.mm (revision 85492) |
| +++ content/common/font_list_mac.mm (working copy) |
| @@ -2,7 +2,7 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "chrome/browser/ui/webui/options/font_settings_utils.h" |
| +#include "content/common/font_list.h" |
| #import <Cocoa/Cocoa.h> |
| @@ -12,25 +12,9 @@ |
| #include "chrome/browser/prefs/pref_service.h" |
|
viettrungluu
2011/05/18 20:40:43
I believe the two prefs includes aren't needed her
|
| #include "chrome/common/pref_names.h" |
| -static void ValidateFontFamily(PrefService* prefs, |
| - const char* family_pref_name) { |
| - // The native font settings dialog saved fonts by the font name, rather |
| - // than the family name. This worked for the old dialog since |
| - // -[NSFont fontWithName:size] accepted a font or family name, but the |
| - // behavior was technically wrong. Since we really need the family name for |
| - // the dom-ui options window, we will fix the saved preference if necessary. |
| - NSString *family_name = |
| - base::SysUTF8ToNSString(prefs->GetString(family_pref_name)); |
| - NSFont *font = [NSFont fontWithName:family_name |
| - size:[NSFont systemFontSize]]; |
| - if (font && |
| - [[font familyName] caseInsensitiveCompare:family_name] != NSOrderedSame) { |
| - std::string new_family_name = base::SysNSStringToUTF8([font familyName]); |
| - prefs->SetString(family_pref_name, new_family_name); |
| - } |
| -} |
| +namespace content { |
| -ListValue* FontSettingsUtilities::GetFontsList() { |
| +ListValue* GetFontList_SlowBlocking() { |
| base::mac::ScopedNSAutoreleasePool autorelease_pool; |
| ListValue* font_list = new ListValue; |
| NSFontManager* fontManager = [[[NSFontManager alloc] init] autorelease]; |
| @@ -48,8 +32,4 @@ |
| return font_list; |
| } |
| -void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) { |
| - ValidateFontFamily(prefs, prefs::kWebKitSerifFontFamily); |
| - ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily); |
| - ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily); |
| -} |
| +} // namespace content |