chrome/browser/ui/webui/options2/font_settings_utils2_mac.mm - Issue 9071026: Copy changes in r115955 from options to options2

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/options2/font_settings_utils2_mac.mm

Issue 9071026: Copy changes in r115955 from options to options2 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 11 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

« no previous file with comments | « chrome/browser/ui/webui/options2/font_settings_handler2.cc ('k') | no next file » | no next file with comments »

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/options2/font_settings_utils2.h"	5 #include "chrome/browser/ui/webui/options2/font_settings_utils2.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 16 matching lines...) Expand all Loading...
27 size:[NSFont systemFontSize]];	27 size:[NSFont systemFontSize]];

28 if (font &&	28 if (font &&

29 [[font familyName] caseInsensitiveCompare:family_name] != NSOrderedSame) {	29 [[font familyName] caseInsensitiveCompare:family_name] != NSOrderedSame) {

30 std::string new_family_name = base::SysNSStringToUTF8([font familyName]);	30 std::string new_family_name = base::SysNSStringToUTF8([font familyName]);

31 prefs->SetString(family_pref_name, new_family_name);	31 prefs->SetString(family_pref_name, new_family_name);

32 }	32 }

33 }	33 }

34	34

35 // static	35 // static

36 void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) {	36 void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) {

37 ValidateFontFamily(prefs, prefs::kWebKitSerifFontFamily);	37 ValidateFontFamily(prefs, prefs::kWebKitGlobalSerifFontFamily);

38 ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily);	38 ValidateFontFamily(prefs, prefs::kWebKitGlobalSansSerifFontFamily);

39 ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily);	39 ValidateFontFamily(prefs, prefs::kWebKitGlobalFixedFontFamily);

40 }	40 }

41	41

42 } // namespace options2	42 } // namespace options2

OLD	NEW