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

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

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Fixed missign deprecated preference registration. Created 4 years, 3 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/prefs/browser_prefs.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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 // The list of prefs we want to observe. 67 // The list of prefs we want to observe.
68 const char* const kPrefsToObserve[] = { 68 const char* const kPrefsToObserve[] = {
69 #if defined(ENABLE_EXTENSIONS) 69 #if defined(ENABLE_EXTENSIONS)
70 prefs::kAnimationPolicy, 70 prefs::kAnimationPolicy,
71 #endif 71 #endif
72 prefs::kDataSaverEnabled, 72 prefs::kDataSaverEnabled,
73 prefs::kDefaultCharset, 73 prefs::kDefaultCharset,
74 prefs::kDisable3DAPIs, 74 prefs::kDisable3DAPIs,
75 prefs::kEnableHyperlinkAuditing, 75 prefs::kEnableHyperlinkAuditing,
76 prefs::kWebKitAllowDisplayingInsecureContent,
77 prefs::kWebKitAllowRunningInsecureContent, 76 prefs::kWebKitAllowRunningInsecureContent,
78 prefs::kWebKitDefaultFixedFontSize, 77 prefs::kWebKitDefaultFixedFontSize,
79 prefs::kWebKitDefaultFontSize, 78 prefs::kWebKitDefaultFontSize,
80 prefs::kWebKitDomPasteEnabled, 79 prefs::kWebKitDomPasteEnabled,
81 #if defined(OS_ANDROID) 80 #if defined(OS_ANDROID)
82 prefs::kWebKitFontScaleFactor, 81 prefs::kWebKitFontScaleFactor,
83 prefs::kWebKitForceEnableZoom, 82 prefs::kWebKitForceEnableZoom,
84 prefs::kWebKitPasswordEchoEnabled, 83 prefs::kWebKitPasswordEchoEnabled,
85 #endif 84 #endif
86 prefs::kWebKitJavascriptCanOpenWindowsAutomatically, 85 prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 registry->RegisterBooleanPref(prefs::kWebKitPluginsEnabled, 514 registry->RegisterBooleanPref(prefs::kWebKitPluginsEnabled,
516 pref_defaults.plugins_enabled); 515 pref_defaults.plugins_enabled);
517 registry->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled, 516 registry->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled,
518 pref_defaults.dom_paste_enabled); 517 pref_defaults.dom_paste_enabled);
519 registry->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable, 518 registry->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable,
520 pref_defaults.text_areas_are_resizable); 519 pref_defaults.text_areas_are_resizable);
521 registry->RegisterBooleanPref(prefs::kWebkitTabsToLinks, 520 registry->RegisterBooleanPref(prefs::kWebkitTabsToLinks,
522 pref_defaults.tabs_to_links); 521 pref_defaults.tabs_to_links);
523 registry->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent, 522 registry->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent,
524 false); 523 false);
525 registry->RegisterBooleanPref(prefs::kWebKitAllowDisplayingInsecureContent,
526 true);
527 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); 524 registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
528 #if defined(OS_ANDROID) 525 #if defined(OS_ANDROID)
529 registry->RegisterDoublePref(prefs::kWebKitFontScaleFactor, 1.0); 526 registry->RegisterDoublePref(prefs::kWebKitFontScaleFactor, 1.0);
530 registry->RegisterBooleanPref(prefs::kWebKitForceEnableZoom, 527 registry->RegisterBooleanPref(prefs::kWebKitForceEnableZoom,
531 pref_defaults.force_enable_zoom); 528 pref_defaults.force_enable_zoom);
532 registry->RegisterBooleanPref(prefs::kWebKitPasswordEchoEnabled, 529 registry->RegisterBooleanPref(prefs::kWebKitPasswordEchoEnabled,
533 pref_defaults.password_echo_enabled); 530 pref_defaults.password_echo_enabled);
534 #endif 531 #endif
535 registry->RegisterStringPref( 532 registry->RegisterStringPref(
536 prefs::kAcceptLanguages, 533 prefs::kAcceptLanguages,
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 } 664 }
668 } 665 }
669 666
670 void PrefsTabHelper::OnWebPrefChanged(const std::string& pref_name) { 667 void PrefsTabHelper::OnWebPrefChanged(const std::string& pref_name) {
671 #if !defined(OS_ANDROID) 668 #if !defined(OS_ANDROID)
672 OnFontFamilyPrefChanged(pref_name); 669 OnFontFamilyPrefChanged(pref_name);
673 #endif 670 #endif
674 671
675 web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged(); 672 web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged();
676 } 673 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698