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

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

Issue 7044012: Support getting the font list in Pepper. This currently only works out of (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 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
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/sys_string_conversions.h" 10 #include "base/sys_string_conversions.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/prefs/pref_service.h" 12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 14
15 static void ValidateFontFamily(PrefService* prefs, 15 static void ValidateFontFamily(PrefService* prefs,
16 const char* family_pref_name) { 16 const char* family_pref_name) {
17 // The native font settings dialog saved fonts by the font name, rather 17 // The native font settings dialog saved fonts by the font name, rather
viettrungluu 2011/05/18 20:21:18 This makes me sad. I suspect that there must be a
brettw 2011/05/18 21:14:38 I didn't want to get into even more crap with this
18 // than the family name. This worked for the old dialog since 18 // than the family name. This worked for the old dialog since
19 // -[NSFont fontWithName:size] accepted a font or family name, but the 19 // -[NSFont fontWithName:size] accepted a font or family name, but the
20 // behavior was technically wrong. Since we really need the family name for 20 // 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. 21 // the dom-ui options window, we will fix the saved preference if necessary.
22 NSString *family_name = 22 NSString *family_name =
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() {
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) { 33 void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) {
viettrungluu 2011/05/18 20:21:18 Ditto about "// static"?
52 ValidateFontFamily(prefs, prefs::kWebKitSerifFontFamily); 34 ValidateFontFamily(prefs, prefs::kWebKitSerifFontFamily);
53 ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily); 35 ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily);
54 ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily); 36 ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily);
55 } 37 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698