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

Side by Side Diff: chrome/browser/ui/webui/options/font_settings_utils_mac.mm

Issue 7204026: Changed fontlist to list all avalilable fonts. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fixed patch Created 9 years, 6 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/common/font_list_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/memory/scoped_nsobject.h"
10 #include "base/sys_string_conversions.h" 11 #include "base/sys_string_conversions.h"
11 #include "base/values.h" 12 #include "base/values.h"
12 #include "chrome/browser/prefs/pref_service.h" 13 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
14 15
15 static void ValidateFontFamily(PrefService* prefs, 16 static void ValidateFontFamily(PrefService* prefs,
16 const char* family_pref_name) { 17 const char* family_pref_name) {
17 // The native font settings dialog saved fonts by the font name, rather 18 // The native font settings dialog saved fonts by the font name, rather
18 // than the family name. This worked for the old dialog since 19 // than the family name. This worked for the old dialog since
19 // -[NSFont fontWithName:size] accepted a font or family name, but the 20 // -[NSFont fontWithName:size] accepted a font or family name, but the
20 // behavior was technically wrong. Since we really need the family name for 21 // behavior was technically wrong. Since we really need the family name for
21 // the dom-ui options window, we will fix the saved preference if necessary. 22 // the dom-ui options window, we will fix the saved preference if necessary.
22 NSString *family_name = 23 NSString *pref_value =
23 base::SysUTF8ToNSString(prefs->GetString(family_pref_name)); 24 base::SysUTF8ToNSString(prefs->GetString(family_pref_name));
24 NSFont *font = [NSFont fontWithName:family_name 25 NSFont *font = [NSFont fontWithName:pref_value
25 size:[NSFont systemFontSize]]; 26 size:[NSFont systemFontSize]];
27 NSString* family_name = [font familyName];
28 scoped_nsobject<NSFontManager> font_manager(
29 [[NSFontManager alloc] init]);
30 // The fixed pitch check is for Osaka-Mono which exceptionally stores font
31 // name instead of font family name. See GetFontList_SlowBlocking
32 // in font_list_mac.mm for more info.
26 if (font && 33 if (font &&
27 [[font familyName] caseInsensitiveCompare:family_name] != NSOrderedSame) { 34 [family_name caseInsensitiveCompare:pref_value] != NSOrderedSame &&
28 std::string new_family_name = base::SysNSStringToUTF8([font familyName]); 35 [font_manager fontNamed:family_name hasTraits:NSFixedPitchFontMask] ==
29 prefs->SetString(family_pref_name, new_family_name); 36 [font_manager fontNamed:pref_value hasTraits:NSFixedPitchFontMask]) {
37 std::string new_pref_value = base::SysNSStringToUTF8(family_name);
38 prefs->SetString(family_pref_name, new_pref_value);
30 } 39 }
31 } 40 }
32 41
33 // static 42 // static
34 void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) { 43 void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) {
35 ValidateFontFamily(prefs, prefs::kWebKitSerifFontFamily); 44 ValidateFontFamily(prefs, prefs::kWebKitSerifFontFamily);
36 ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily); 45 ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily);
37 ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily); 46 ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily);
38 } 47 }
OLDNEW
« no previous file with comments | « no previous file | content/common/font_list_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698