| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/dom_ui/font_settings_utils.h" | 5 #include "chrome/browser/dom_ui/font_settings_utils.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| 11 #include "chrome/browser/pref_service.h" | 11 #include "chrome/browser/prefs/pref_service.h" |
| 12 #include "chrome/common/pref_names.h" | 12 #include "chrome/common/pref_names.h" |
| 13 | 13 |
| 14 static void ValidateFontFamily(PrefService* prefs, | 14 static void ValidateFontFamily(PrefService* prefs, |
| 15 const char* family_pref_name) { | 15 const char* family_pref_name) { |
| 16 // The native font settings dialog saved fonts by the font name, rather | 16 // The native font settings dialog saved fonts by the font name, rather |
| 17 // than the family name. This worked for the old dialog since | 17 // than the family name. This worked for the old dialog since |
| 18 // -[NSFont fontWithName:size] accepted a font or family name, but the | 18 // -[NSFont fontWithName:size] accepted a font or family name, but the |
| 19 // behavior was technically wrong. Since we really need the family name for | 19 // behavior was technically wrong. Since we really need the family name for |
| 20 // the dom-ui options window, we will fix the saved preference if necessary. | 20 // the dom-ui options window, we will fix the saved preference if necessary. |
| 21 NSString *family_name = | 21 NSString *family_name = |
| (...skipping 22 matching lines...) Expand all Loading... |
| 44 font_list->Append(font_item); | 44 font_list->Append(font_item); |
| 45 } | 45 } |
| 46 return font_list; | 46 return font_list; |
| 47 } | 47 } |
| 48 | 48 |
| 49 void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) { | 49 void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) { |
| 50 ValidateFontFamily(prefs, prefs::kWebKitSerifFontFamily); | 50 ValidateFontFamily(prefs, prefs::kWebKitSerifFontFamily); |
| 51 ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily); | 51 ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily); |
| 52 ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily); | 52 ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily); |
| 53 } | 53 } |
| OLD | NEW |