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

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

Issue 10983010: FontScaleFactor and ForceEnableZoom pref_names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added missing variables to WebPreferences Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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/string_util.h" 9 #include "base/string_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // The list of prefs we want to observe. 94 // The list of prefs we want to observe.
95 const char* kPrefsToObserve[] = { 95 const char* kPrefsToObserve[] = {
96 prefs::kDefaultZoomLevel, 96 prefs::kDefaultZoomLevel,
97 prefs::kDefaultCharset, 97 prefs::kDefaultCharset,
98 prefs::kEnableReferrers, 98 prefs::kEnableReferrers,
99 prefs::kEnableDoNotTrack, 99 prefs::kEnableDoNotTrack,
100 prefs::kWebKitAllowDisplayingInsecureContent, 100 prefs::kWebKitAllowDisplayingInsecureContent,
101 prefs::kWebKitAllowRunningInsecureContent, 101 prefs::kWebKitAllowRunningInsecureContent,
102 prefs::kWebKitDefaultFixedFontSize, 102 prefs::kWebKitDefaultFixedFontSize,
103 prefs::kWebKitDefaultFontSize, 103 prefs::kWebKitDefaultFontSize,
104 #if defined(OS_ANDROID)
105 prefs::kWebKitFontScaleFactor,
106 prefs::kWebKitForceEnableZoom,
107 #endif
104 prefs::kWebKitJavascriptEnabled, 108 prefs::kWebKitJavascriptEnabled,
105 prefs::kWebKitJavaEnabled, 109 prefs::kWebKitJavaEnabled,
106 prefs::kWebKitLoadsImagesAutomatically, 110 prefs::kWebKitLoadsImagesAutomatically,
107 prefs::kWebKitMinimumFontSize, 111 prefs::kWebKitMinimumFontSize,
108 prefs::kWebKitMinimumLogicalFontSize, 112 prefs::kWebKitMinimumLogicalFontSize,
109 prefs::kWebKitPluginsEnabled, 113 prefs::kWebKitPluginsEnabled,
110 prefs::kWebkitTabsToLinks, 114 prefs::kWebkitTabsToLinks,
111 prefs::kWebKitUsesUniversalDetector 115 prefs::kWebKitUsesUniversalDetector
112 }; 116 };
113 117
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 PrefService::UNSYNCABLE_PREF); 429 PrefService::UNSYNCABLE_PREF);
426 prefs->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent, 430 prefs->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent,
427 false, 431 false,
428 PrefService::UNSYNCABLE_PREF); 432 PrefService::UNSYNCABLE_PREF);
429 prefs->RegisterBooleanPref(prefs::kWebKitAllowDisplayingInsecureContent, 433 prefs->RegisterBooleanPref(prefs::kWebKitAllowDisplayingInsecureContent,
430 true, 434 true,
431 PrefService::UNSYNCABLE_PREF); 435 PrefService::UNSYNCABLE_PREF);
432 prefs->RegisterBooleanPref(prefs::kEnableReferrers, 436 prefs->RegisterBooleanPref(prefs::kEnableReferrers,
433 true, 437 true,
434 PrefService::UNSYNCABLE_PREF); 438 PrefService::UNSYNCABLE_PREF);
439 #if defined(OS_ANDROID)
440 prefs->RegisterDoublePref(prefs::kWebKitFontScaleFactor,
441 pref_defaults.font_scale_factor,
442 PrefService::UNSYNCABLE_PREF);
443 prefs->RegisterBooleanPref(prefs::kWebKitForceEnableZoom,
444 pref_defaults.force_enable_zoom,
445 PrefService::UNSYNCABLE_PREF);
446 #endif
435 447
436 #if !defined(OS_MACOSX) 448 #if !defined(OS_MACOSX)
437 prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages, 449 prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages,
438 IDS_ACCEPT_LANGUAGES, 450 IDS_ACCEPT_LANGUAGES,
439 PrefService::SYNCABLE_PREF); 451 PrefService::SYNCABLE_PREF);
440 #else 452 #else
441 // Not used in OSX. 453 // Not used in OSX.
442 prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages, 454 prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages,
443 IDS_ACCEPT_LANGUAGES, 455 IDS_ACCEPT_LANGUAGES,
444 PrefService::UNSYNCABLE_PREF); 456 PrefService::UNSYNCABLE_PREF);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 558
547 void PrefsTabHelper::UpdateRendererPreferences() { 559 void PrefsTabHelper::UpdateRendererPreferences() {
548 renderer_preferences_util::UpdateFromSystemSettings( 560 renderer_preferences_util::UpdateFromSystemSettings(
549 web_contents_->GetMutableRendererPrefs(), GetProfile()); 561 web_contents_->GetMutableRendererPrefs(), GetProfile());
550 web_contents_->GetRenderViewHost()->SyncRendererPrefs(); 562 web_contents_->GetRenderViewHost()->SyncRendererPrefs();
551 } 563 }
552 564
553 Profile* PrefsTabHelper::GetProfile() { 565 Profile* PrefsTabHelper::GetProfile() {
554 return Profile::FromBrowserContext(web_contents_->GetBrowserContext()); 566 return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
555 } 567 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698