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

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

Issue 1313243002: Remove command line flags and prefs for disabling Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
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 <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 prefs::kWebKitDefaultFixedFontSize, 69 prefs::kWebKitDefaultFixedFontSize,
70 prefs::kWebKitDefaultFontSize, 70 prefs::kWebKitDefaultFontSize,
71 prefs::kWebKitDomPasteEnabled, 71 prefs::kWebKitDomPasteEnabled,
72 #if defined(OS_ANDROID) 72 #if defined(OS_ANDROID)
73 prefs::kWebKitFontScaleFactor, 73 prefs::kWebKitFontScaleFactor,
74 prefs::kWebKitForceEnableZoom, 74 prefs::kWebKitForceEnableZoom,
75 prefs::kWebKitPasswordEchoEnabled, 75 prefs::kWebKitPasswordEchoEnabled,
76 #endif 76 #endif
77 prefs::kWebKitJavascriptCanOpenWindowsAutomatically, 77 prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
78 prefs::kWebKitJavascriptEnabled, 78 prefs::kWebKitJavascriptEnabled,
79 prefs::kWebKitJavaEnabled,
80 prefs::kWebKitLoadsImagesAutomatically, 79 prefs::kWebKitLoadsImagesAutomatically,
81 prefs::kWebKitMinimumFontSize, 80 prefs::kWebKitMinimumFontSize,
82 prefs::kWebKitMinimumLogicalFontSize, 81 prefs::kWebKitMinimumLogicalFontSize,
83 prefs::kWebKitPluginsEnabled, 82 prefs::kWebKitPluginsEnabled,
84 prefs::kWebkitTabsToLinks, 83 prefs::kWebkitTabsToLinks,
85 prefs::kWebKitTextAreasAreResizable, 84 prefs::kWebKitTextAreasAreResizable,
86 prefs::kWebKitUsesUniversalDetector, 85 prefs::kWebKitUsesUniversalDetector,
87 prefs::kWebKitWebSecurityEnabled, 86 prefs::kWebKitWebSecurityEnabled,
88 }; 87 };
89 88
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 registry->RegisterBooleanPref( 526 registry->RegisterBooleanPref(
528 prefs::kWebKitJavascriptCanOpenWindowsAutomatically, true); 527 prefs::kWebKitJavascriptCanOpenWindowsAutomatically, true);
529 registry->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically, 528 registry->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically,
530 pref_defaults.loads_images_automatically); 529 pref_defaults.loads_images_automatically);
531 registry->RegisterBooleanPref(prefs::kWebKitPluginsEnabled, 530 registry->RegisterBooleanPref(prefs::kWebKitPluginsEnabled,
532 pref_defaults.plugins_enabled); 531 pref_defaults.plugins_enabled);
533 registry->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled, 532 registry->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled,
534 pref_defaults.dom_paste_enabled); 533 pref_defaults.dom_paste_enabled);
535 registry->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable, 534 registry->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable,
536 pref_defaults.text_areas_are_resizable); 535 pref_defaults.text_areas_are_resizable);
537 registry->RegisterBooleanPref(prefs::kWebKitJavaEnabled,
538 pref_defaults.java_enabled);
539 registry->RegisterBooleanPref(prefs::kWebkitTabsToLinks, 536 registry->RegisterBooleanPref(prefs::kWebkitTabsToLinks,
540 pref_defaults.tabs_to_links); 537 pref_defaults.tabs_to_links);
541 registry->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent, 538 registry->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent,
542 false); 539 false);
543 registry->RegisterBooleanPref(prefs::kWebKitAllowDisplayingInsecureContent, 540 registry->RegisterBooleanPref(prefs::kWebKitAllowDisplayingInsecureContent,
544 true); 541 true);
545 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); 542 registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
546 #if defined(OS_ANDROID) 543 #if defined(OS_ANDROID)
547 registry->RegisterDoublePref(prefs::kWebKitFontScaleFactor, 1.0); 544 registry->RegisterDoublePref(prefs::kWebKitFontScaleFactor, 1.0);
548 registry->RegisterBooleanPref(prefs::kWebKitForceEnableZoom, 545 registry->RegisterBooleanPref(prefs::kWebKitForceEnableZoom,
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 } 681 }
685 } 682 }
686 683
687 void PrefsTabHelper::OnWebPrefChanged(const std::string& pref_name) { 684 void PrefsTabHelper::OnWebPrefChanged(const std::string& pref_name) {
688 #if !defined(OS_ANDROID) 685 #if !defined(OS_ANDROID)
689 OnFontFamilyPrefChanged(pref_name); 686 OnFontFamilyPrefChanged(pref_name);
690 #endif 687 #endif
691 688
692 web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged(); 689 web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged();
693 } 690 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698