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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/prefs/prefs_tab_helper.cc
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
index e57c8a9e1c802414366c56f857b1ce0a8133e0e4..19c773df7575873389cebf745c46339dd3c34252 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -76,7 +76,6 @@ const char* kPrefsToObserve[] = {
#endif
prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
prefs::kWebKitJavascriptEnabled,
- prefs::kWebKitJavaEnabled,
prefs::kWebKitLoadsImagesAutomatically,
prefs::kWebKitMinimumFontSize,
prefs::kWebKitMinimumLogicalFontSize,
@@ -534,8 +533,6 @@ void PrefsTabHelper::RegisterProfilePrefs(
pref_defaults.dom_paste_enabled);
registry->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable,
pref_defaults.text_areas_are_resizable);
- registry->RegisterBooleanPref(prefs::kWebKitJavaEnabled,
- pref_defaults.java_enabled);
registry->RegisterBooleanPref(prefs::kWebkitTabsToLinks,
pref_defaults.tabs_to_links);
registry->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent,

Powered by Google App Engine
This is Rietveld 408576698