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

Side by Side Diff: chrome/browser/ui/prefs/prefs_tab_helper.cc

Issue 14877009: Revert r196089 "Add default values for Latin script font prefs." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: new partch after syncing Created 7 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
« no previous file with comments | « chrome/app/resources/locale_settings_win.grd ('k') | chrome/common/pref_names.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/prefs/prefs_tab_helper.h" 5 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/prefs/overlay_user_pref_store.h" 9 #include "base/prefs/overlay_user_pref_store.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // TODO(falken): add proper defaults when possible for all 202 // TODO(falken): add proper defaults when possible for all
203 // platforms/scripts/generic families. 203 // platforms/scripts/generic families.
204 const FontDefault kFontDefaults[] = { 204 const FontDefault kFontDefaults[] = {
205 { prefs::kWebKitStandardFontFamily, IDS_STANDARD_FONT_FAMILY }, 205 { prefs::kWebKitStandardFontFamily, IDS_STANDARD_FONT_FAMILY },
206 { prefs::kWebKitFixedFontFamily, IDS_FIXED_FONT_FAMILY }, 206 { prefs::kWebKitFixedFontFamily, IDS_FIXED_FONT_FAMILY },
207 { prefs::kWebKitSerifFontFamily, IDS_SERIF_FONT_FAMILY }, 207 { prefs::kWebKitSerifFontFamily, IDS_SERIF_FONT_FAMILY },
208 { prefs::kWebKitSansSerifFontFamily, IDS_SANS_SERIF_FONT_FAMILY }, 208 { prefs::kWebKitSansSerifFontFamily, IDS_SANS_SERIF_FONT_FAMILY },
209 { prefs::kWebKitCursiveFontFamily, IDS_CURSIVE_FONT_FAMILY }, 209 { prefs::kWebKitCursiveFontFamily, IDS_CURSIVE_FONT_FAMILY },
210 { prefs::kWebKitFantasyFontFamily, IDS_FANTASY_FONT_FAMILY }, 210 { prefs::kWebKitFantasyFontFamily, IDS_FANTASY_FONT_FAMILY },
211 { prefs::kWebKitPictographFontFamily, IDS_PICTOGRAPH_FONT_FAMILY }, 211 { prefs::kWebKitPictographFontFamily, IDS_PICTOGRAPH_FONT_FAMILY },
212 { prefs::kWebKitStandardFontFamilyLatin, IDS_STANDARD_FONT_FAMILY_LATIN },
213 { prefs::kWebKitFixedFontFamilyLatin, IDS_FIXED_FONT_FAMILY_LATIN },
214 { prefs::kWebKitSerifFontFamilyLatin, IDS_SERIF_FONT_FAMILY_LATIN },
215 { prefs::kWebKitSansSerifFontFamilyLatin, IDS_SANS_SERIF_FONT_FAMILY_LATIN },
216 { prefs::kWebKitCursiveFontFamilyLatin, IDS_CURSIVE_FONT_FAMILY_LATIN },
217 { prefs::kWebKitFantasyFontFamilyLatin, IDS_FANTASY_FONT_FAMILY_LATIN },
218 { prefs::kWebKitPictographFontFamilyLatin, IDS_PICTOGRAPH_FONT_FAMILY_LATIN },
219 #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) 212 #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN)
220 { prefs::kWebKitStandardFontFamilyJapanese, 213 { prefs::kWebKitStandardFontFamilyJapanese,
221 IDS_STANDARD_FONT_FAMILY_JAPANESE }, 214 IDS_STANDARD_FONT_FAMILY_JAPANESE },
222 { prefs::kWebKitFixedFontFamilyJapanese, IDS_FIXED_FONT_FAMILY_JAPANESE }, 215 { prefs::kWebKitFixedFontFamilyJapanese, IDS_FIXED_FONT_FAMILY_JAPANESE },
223 { prefs::kWebKitSerifFontFamilyJapanese, IDS_SERIF_FONT_FAMILY_JAPANESE }, 216 { prefs::kWebKitSerifFontFamilyJapanese, IDS_SERIF_FONT_FAMILY_JAPANESE },
224 { prefs::kWebKitSansSerifFontFamilyJapanese, 217 { prefs::kWebKitSansSerifFontFamilyJapanese,
225 IDS_SANS_SERIF_FONT_FAMILY_JAPANESE }, 218 IDS_SANS_SERIF_FONT_FAMILY_JAPANESE },
226 { prefs::kWebKitStandardFontFamilyKorean, IDS_STANDARD_FONT_FAMILY_KOREAN }, 219 { prefs::kWebKitStandardFontFamilyKorean, IDS_STANDARD_FONT_FAMILY_KOREAN },
227 { prefs::kWebKitSerifFontFamilyKorean, IDS_SERIF_FONT_FAMILY_KOREAN }, 220 { prefs::kWebKitSerifFontFamilyKorean, IDS_SERIF_FONT_FAMILY_KOREAN },
228 { prefs::kWebKitSansSerifFontFamilyKorean, 221 { prefs::kWebKitSansSerifFontFamilyKorean,
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 WebPreferences web_prefs = 713 WebPreferences web_prefs =
721 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); 714 web_contents_->GetRenderViewHost()->GetWebkitPreferences();
722 OverrideFontFamily(&web_prefs, generic_family, script, std::string()); 715 OverrideFontFamily(&web_prefs, generic_family, script, std::string());
723 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); 716 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs);
724 return; 717 return;
725 } 718 }
726 } 719 }
727 720
728 UpdateWebPreferences(); 721 UpdateWebPreferences();
729 } 722 }
OLDNEW
« no previous file with comments | « chrome/app/resources/locale_settings_win.grd ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698