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

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

Issue 263423003: Add a policy to re-enable deprecated web platform features. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 weak_ptr_factory_(this) { 291 weak_ptr_factory_(this) {
292 PrefService* prefs = GetProfile()->GetPrefs(); 292 PrefService* prefs = GetProfile()->GetPrefs();
293 pref_change_registrar_.Init(prefs); 293 pref_change_registrar_.Init(prefs);
294 if (prefs) { 294 if (prefs) {
295 base::Closure renderer_callback = base::Bind( 295 base::Closure renderer_callback = base::Bind(
296 &PrefsTabHelper::UpdateRendererPreferences, base::Unretained(this)); 296 &PrefsTabHelper::UpdateRendererPreferences, base::Unretained(this));
297 pref_change_registrar_.Add(prefs::kAcceptLanguages, renderer_callback); 297 pref_change_registrar_.Add(prefs::kAcceptLanguages, renderer_callback);
298 pref_change_registrar_.Add(prefs::kDefaultZoomLevel, renderer_callback); 298 pref_change_registrar_.Add(prefs::kDefaultZoomLevel, renderer_callback);
299 pref_change_registrar_.Add(prefs::kEnableDoNotTrack, renderer_callback); 299 pref_change_registrar_.Add(prefs::kEnableDoNotTrack, renderer_callback);
300 pref_change_registrar_.Add(prefs::kEnableReferrers, renderer_callback); 300 pref_change_registrar_.Add(prefs::kEnableReferrers, renderer_callback);
301 pref_change_registrar_.Add(prefs::kEnableDeprecatedWebPlatformFeatures,
302 renderer_callback);
301 303
302 #if !defined(OS_MACOSX) 304 #if !defined(OS_MACOSX)
303 pref_change_registrar_.Add(prefs::kFullscreenAllowed, renderer_callback); 305 pref_change_registrar_.Add(prefs::kFullscreenAllowed, renderer_callback);
304 #endif 306 #endif
305 307
306 PrefChangeRegistrar::NamedChangeCallback webkit_callback = base::Bind( 308 PrefChangeRegistrar::NamedChangeCallback webkit_callback = base::Bind(
307 &PrefsTabHelper::OnWebPrefChanged, base::Unretained(this)); 309 &PrefsTabHelper::OnWebPrefChanged, base::Unretained(this));
308 for (int i = 0; i < kPrefsToObserveLength; ++i) { 310 for (int i = 0; i < kPrefsToObserveLength; ++i) {
309 const char* pref_name = kPrefsToObserve[i]; 311 const char* pref_name = kPrefsToObserve[i];
310 DCHECK(std::string(pref_name) == prefs::kDefaultCharset || 312 DCHECK(std::string(pref_name) == prefs::kDefaultCharset ||
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 444 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
443 #endif 445 #endif
444 registry->RegisterLocalizedStringPref( 446 registry->RegisterLocalizedStringPref(
445 prefs::kAcceptLanguages, 447 prefs::kAcceptLanguages,
446 IDS_ACCEPT_LANGUAGES, 448 IDS_ACCEPT_LANGUAGES,
447 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 449 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
448 registry->RegisterLocalizedStringPref( 450 registry->RegisterLocalizedStringPref(
449 prefs::kDefaultCharset, 451 prefs::kDefaultCharset,
450 IDS_DEFAULT_ENCODING, 452 IDS_DEFAULT_ENCODING,
451 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 453 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
454 registry->RegisterListPref(
455 prefs::kEnableDeprecatedWebPlatformFeatures,
456 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
452 457
453 // Register font prefs that have defaults. 458 // Register font prefs that have defaults.
454 std::set<std::string> fonts_with_defaults; 459 std::set<std::string> fonts_with_defaults;
455 UScriptCode browser_script = GetScriptOfBrowserLocale(); 460 UScriptCode browser_script = GetScriptOfBrowserLocale();
456 for (size_t i = 0; i < kFontDefaultsLength; ++i) { 461 for (size_t i = 0; i < kFontDefaultsLength; ++i) {
457 const FontDefault& pref = kFontDefaults[i]; 462 const FontDefault& pref = kFontDefaults[i];
458 UScriptCode pref_script = GetScriptOfFontPref(pref.pref_name); 463 UScriptCode pref_script = GetScriptOfFontPref(pref.pref_name);
459 464
460 // Suppress this default font pref value if it is for the primary script of 465 // Suppress this default font pref value if it is for the primary script of
461 // the browser's UI locale. For example, if the pref is for the sans-serif 466 // the browser's UI locale. For example, if the pref is for the sans-serif
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 WebPreferences web_prefs = 577 WebPreferences web_prefs =
573 web_contents_->GetRenderViewHost()->GetWebkitPreferences(); 578 web_contents_->GetRenderViewHost()->GetWebkitPreferences();
574 OverrideFontFamily(&web_prefs, generic_family, script, std::string()); 579 OverrideFontFamily(&web_prefs, generic_family, script, std::string());
575 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs); 580 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs);
576 return; 581 return;
577 } 582 }
578 } 583 }
579 584
580 UpdateWebPreferences(); 585 UpdateWebPreferences();
581 } 586 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698