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 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 prefs::kWebKitAllowDisplayingInsecureContent, | 557 prefs::kWebKitAllowDisplayingInsecureContent, |
558 true, | 558 true, |
559 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 559 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
560 registry->RegisterBooleanPref( | 560 registry->RegisterBooleanPref( |
561 prefs::kEnableReferrers, | 561 prefs::kEnableReferrers, |
562 true, | 562 true, |
563 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 563 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
564 #if defined(OS_ANDROID) | 564 #if defined(OS_ANDROID) |
565 registry->RegisterDoublePref( | 565 registry->RegisterDoublePref( |
566 prefs::kWebKitFontScaleFactor, | 566 prefs::kWebKitFontScaleFactor, |
567 pref_defaults.font_scale_factor, | 567 1.0, |
| 568 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 569 registry->RegisterBooleanPref( |
| 570 prefs::kWebKitFontScaleFactorQuirk, |
| 571 true, |
568 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 572 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
569 registry->RegisterBooleanPref( | 573 registry->RegisterBooleanPref( |
570 prefs::kWebKitForceEnableZoom, | 574 prefs::kWebKitForceEnableZoom, |
571 pref_defaults.force_enable_zoom, | 575 pref_defaults.force_enable_zoom, |
572 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 576 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
573 registry->RegisterBooleanPref( | 577 registry->RegisterBooleanPref( |
574 prefs::kWebKitPasswordEchoEnabled, | 578 prefs::kWebKitPasswordEchoEnabled, |
575 pref_defaults.password_echo_enabled, | 579 pref_defaults.password_echo_enabled, |
576 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 580 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
577 #endif | 581 #endif |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
717 WebPreferences web_prefs = | 721 WebPreferences web_prefs = |
718 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); | 722 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); |
719 OverrideFontFamily(&web_prefs, generic_family, script, std::string()); | 723 OverrideFontFamily(&web_prefs, generic_family, script, std::string()); |
720 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); | 724 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); |
721 return; | 725 return; |
722 } | 726 } |
723 } | 727 } |
724 | 728 |
725 UpdateWebPreferences(); | 729 UpdateWebPreferences(); |
726 } | 730 } |
OLD | NEW |