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

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

Issue 28053002: Add font_scale_factor_quirk pref. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master.pinned
Patch Set: Address review comments. Created 7 years, 2 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/chrome_content_browser_client.cc ('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 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
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 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698