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

Unified Diff: chrome/browser/ui/webui/options2/font_settings_utils_mac.mm

Issue 10837331: Options: s/options2/options/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wut Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options2/font_settings_utils_mac.mm
diff --git a/chrome/browser/ui/webui/options2/font_settings_utils_mac.mm b/chrome/browser/ui/webui/options2/font_settings_utils_mac.mm
deleted file mode 100644
index fce39d953d1c3c86919d5a72b9dd2e07bffbc694..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/webui/options2/font_settings_utils_mac.mm
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// 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/options2/font_settings_utils.h"
-
-#import <Cocoa/Cocoa.h>
-
-#include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/sys_string_conversions.h"
-#include "base/values.h"
-#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/common/pref_names.h"
-
-namespace options {
-
-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);
- }
-}
-
-// static
-void FontSettingsUtilities::ValidateSavedFonts(PrefService* prefs) {
- ValidateFontFamily(prefs, prefs::kWebKitSerifFontFamily);
- ValidateFontFamily(prefs, prefs::kWebKitSansSerifFontFamily);
- ValidateFontFamily(prefs, prefs::kWebKitFixedFontFamily);
-}
-
-} // namespace options
« no previous file with comments | « chrome/browser/ui/webui/options2/font_settings_utils.h ('k') | chrome/browser/ui/webui/options2/font_settings_utils_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698