Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 131 const char* pref_name = pref_name_str.c_str(); | 131 const char* pref_name = pref_name_str.c_str(); |
| 132 if (fonts_with_defaults.find(pref_name) == fonts_with_defaults.end()) { | 132 if (fonts_with_defaults.find(pref_name) == fonts_with_defaults.end()) { |
| 133 // We haven't already set a default value for this font preference, so set | 133 // We haven't already set a default value for this font preference, so set |
| 134 // an empty string as the default. | 134 // an empty string as the default. |
| 135 registry->RegisterStringPref( | 135 registry->RegisterStringPref( |
| 136 pref_name, "", PrefRegistrySyncable::UNSYNCABLE_PREF); | 136 pref_name, "", PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 137 } | 137 } |
| 138 } | 138 } |
| 139 } | 139 } |
| 140 | 140 |
| 141 #if !defined(OS_ANDROID) | |
|
falken
2013/03/18 19:07:37
Can you add a comment explaining why we don't do t
| |
| 141 // Registers |obs| to observe per-script font prefs under the path |map_name|. | 142 // Registers |obs| to observe per-script font prefs under the path |map_name|. |
| 142 void RegisterFontFamilyMapObserver( | 143 void RegisterFontFamilyMapObserver( |
| 143 PrefChangeRegistrar* registrar, | 144 PrefChangeRegistrar* registrar, |
| 144 const char* map_name, | 145 const char* map_name, |
| 145 const PrefChangeRegistrar::NamedChangeCallback& obs) { | 146 const PrefChangeRegistrar::NamedChangeCallback& obs) { |
| 146 DCHECK(StartsWithASCII(map_name, "webkit.webprefs.", true)); | 147 DCHECK(StartsWithASCII(map_name, "webkit.webprefs.", true)); |
| 147 for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) { | 148 for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) { |
| 148 const char* script = prefs::kWebKitScriptsForFontFamilyMaps[i]; | 149 const char* script = prefs::kWebKitScriptsForFontFamilyMaps[i]; |
| 149 std::string pref_name = base::StringPrintf("%s.%s", map_name, script); | 150 std::string pref_name = base::StringPrintf("%s.%s", map_name, script); |
| 150 registrar->Add(pref_name.c_str(), obs); | 151 registrar->Add(pref_name.c_str(), obs); |
| 151 } | 152 } |
| 152 } | 153 } |
| 154 #endif // !defined(OS_ANDROID) | |
| 153 | 155 |
| 154 struct FontDefault { | 156 struct FontDefault { |
| 155 const char* pref_name; | 157 const char* pref_name; |
| 156 int resource_id; | 158 int resource_id; |
| 157 }; | 159 }; |
| 158 | 160 |
| 159 // Font pref defaults. The prefs that have defaults vary by platform, since not | 161 // Font pref defaults. The prefs that have defaults vary by platform, since not |
| 160 // all platforms have fonts for all scripts for all generic families. | 162 // all platforms have fonts for all scripts for all generic families. |
| 161 // TODO(falken): add proper defaults when possible for all | 163 // TODO(falken): add proper defaults when possible for all |
| 162 // platforms/scripts/generic families. | 164 // platforms/scripts/generic families. |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 380 | 382 |
| 381 PrefChangeRegistrar::NamedChangeCallback webkit_callback = base::Bind( | 383 PrefChangeRegistrar::NamedChangeCallback webkit_callback = base::Bind( |
| 382 &PrefsTabHelper::OnWebPrefChanged, base::Unretained(this)); | 384 &PrefsTabHelper::OnWebPrefChanged, base::Unretained(this)); |
| 383 for (int i = 0; i < kPrefsToObserveLength; ++i) { | 385 for (int i = 0; i < kPrefsToObserveLength; ++i) { |
| 384 const char* pref_name = kPrefsToObserve[i]; | 386 const char* pref_name = kPrefsToObserve[i]; |
| 385 DCHECK(std::string(pref_name) == prefs::kDefaultCharset || | 387 DCHECK(std::string(pref_name) == prefs::kDefaultCharset || |
| 386 StartsWithASCII(pref_name, "webkit.webprefs.", true)); | 388 StartsWithASCII(pref_name, "webkit.webprefs.", true)); |
| 387 pref_change_registrar_.Add(pref_name, webkit_callback); | 389 pref_change_registrar_.Add(pref_name, webkit_callback); |
| 388 } | 390 } |
| 389 | 391 |
| 392 #if !defined(OS_ANDROID) | |
| 390 RegisterFontFamilyMapObserver(&pref_change_registrar_, | 393 RegisterFontFamilyMapObserver(&pref_change_registrar_, |
| 391 prefs::kWebKitStandardFontFamilyMap, | 394 prefs::kWebKitStandardFontFamilyMap, |
| 392 webkit_callback); | 395 webkit_callback); |
| 393 RegisterFontFamilyMapObserver(&pref_change_registrar_, | 396 RegisterFontFamilyMapObserver(&pref_change_registrar_, |
| 394 prefs::kWebKitFixedFontFamilyMap, | 397 prefs::kWebKitFixedFontFamilyMap, |
| 395 webkit_callback); | 398 webkit_callback); |
| 396 RegisterFontFamilyMapObserver(&pref_change_registrar_, | 399 RegisterFontFamilyMapObserver(&pref_change_registrar_, |
| 397 prefs::kWebKitSerifFontFamilyMap, | 400 prefs::kWebKitSerifFontFamilyMap, |
| 398 webkit_callback); | 401 webkit_callback); |
| 399 RegisterFontFamilyMapObserver(&pref_change_registrar_, | 402 RegisterFontFamilyMapObserver(&pref_change_registrar_, |
| 400 prefs::kWebKitSansSerifFontFamilyMap, | 403 prefs::kWebKitSansSerifFontFamilyMap, |
| 401 webkit_callback); | 404 webkit_callback); |
| 402 RegisterFontFamilyMapObserver(&pref_change_registrar_, | 405 RegisterFontFamilyMapObserver(&pref_change_registrar_, |
| 403 prefs::kWebKitCursiveFontFamilyMap, | 406 prefs::kWebKitCursiveFontFamilyMap, |
| 404 webkit_callback); | 407 webkit_callback); |
| 405 RegisterFontFamilyMapObserver(&pref_change_registrar_, | 408 RegisterFontFamilyMapObserver(&pref_change_registrar_, |
| 406 prefs::kWebKitFantasyFontFamilyMap, | 409 prefs::kWebKitFantasyFontFamilyMap, |
| 407 webkit_callback); | 410 webkit_callback); |
| 408 RegisterFontFamilyMapObserver(&pref_change_registrar_, | 411 RegisterFontFamilyMapObserver(&pref_change_registrar_, |
| 409 prefs::kWebKitPictographFontFamilyMap, | 412 prefs::kWebKitPictographFontFamilyMap, |
| 410 webkit_callback); | 413 webkit_callback); |
| 414 #endif // !defined(OS_ANDROID) | |
| 411 } | 415 } |
| 412 | 416 |
| 413 renderer_preferences_util::UpdateFromSystemSettings( | 417 renderer_preferences_util::UpdateFromSystemSettings( |
| 414 web_contents_->GetMutableRendererPrefs(), GetProfile()); | 418 web_contents_->GetMutableRendererPrefs(), GetProfile()); |
| 415 | 419 |
| 416 registrar_.Add(this, chrome::NOTIFICATION_USER_STYLE_SHEET_UPDATED, | 420 registrar_.Add(this, chrome::NOTIFICATION_USER_STYLE_SHEET_UPDATED, |
| 417 content::NotificationService::AllSources()); | 421 content::NotificationService::AllSources()); |
| 418 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) | 422 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) |
| 419 registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED, | 423 registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED, |
| 420 content::Source<ThemeService>( | 424 content::Source<ThemeService>( |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 654 WebPreferences web_prefs = | 658 WebPreferences web_prefs = |
| 655 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); | 659 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); |
| 656 OverrideFontFamily(&web_prefs, generic_family, script, ""); | 660 OverrideFontFamily(&web_prefs, generic_family, script, ""); |
| 657 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); | 661 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); |
| 658 return; | 662 return; |
| 659 } | 663 } |
| 660 } | 664 } |
| 661 | 665 |
| 662 UpdateWebPreferences(); | 666 UpdateWebPreferences(); |
| 663 } | 667 } |
| OLD | NEW |