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

Side by Side Diff: chrome/browser/chrome_content_browser_client.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, 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
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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2125 matching lines...) Expand 10 before | Expand all | Expand 10 after
2136 web_prefs->dom_paste_enabled = 2136 web_prefs->dom_paste_enabled =
2137 prefs->GetBoolean(prefs::kWebKitDomPasteEnabled); 2137 prefs->GetBoolean(prefs::kWebKitDomPasteEnabled);
2138 web_prefs->tabs_to_links = prefs->GetBoolean(prefs::kWebkitTabsToLinks); 2138 web_prefs->tabs_to_links = prefs->GetBoolean(prefs::kWebkitTabsToLinks);
2139 2139
2140 if (!prefs->GetBoolean(prefs::kWebKitJavascriptEnabled)) 2140 if (!prefs->GetBoolean(prefs::kWebKitJavascriptEnabled))
2141 web_prefs->javascript_enabled = false; 2141 web_prefs->javascript_enabled = false;
2142 if (!prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled)) 2142 if (!prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled))
2143 web_prefs->web_security_enabled = false; 2143 web_prefs->web_security_enabled = false;
2144 if (!prefs->GetBoolean(prefs::kWebKitPluginsEnabled)) 2144 if (!prefs->GetBoolean(prefs::kWebKitPluginsEnabled))
2145 web_prefs->plugins_enabled = false; 2145 web_prefs->plugins_enabled = false;
2146 if (!prefs->GetBoolean(prefs::kWebKitJavaEnabled))
2147 web_prefs->java_enabled = false;
2148 web_prefs->loads_images_automatically = 2146 web_prefs->loads_images_automatically =
2149 prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically); 2147 prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically);
2150 2148
2151 if (prefs->GetBoolean(prefs::kDisable3DAPIs)) 2149 if (prefs->GetBoolean(prefs::kDisable3DAPIs))
2152 web_prefs->experimental_webgl_enabled = false; 2150 web_prefs->experimental_webgl_enabled = false;
2153 2151
2154 web_prefs->allow_displaying_insecure_content = 2152 web_prefs->allow_displaying_insecure_content =
2155 prefs->GetBoolean(prefs::kWebKitAllowDisplayingInsecureContent); 2153 prefs->GetBoolean(prefs::kWebKitAllowDisplayingInsecureContent);
2156 web_prefs->allow_running_insecure_content = 2154 web_prefs->allow_running_insecure_content =
2157 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent); 2155 prefs->GetBoolean(prefs::kWebKitAllowRunningInsecureContent);
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
2622 switches::kDisableWebRtcEncryption, 2620 switches::kDisableWebRtcEncryption,
2623 }; 2621 };
2624 to_command_line->CopySwitchesFrom(from_command_line, 2622 to_command_line->CopySwitchesFrom(from_command_line,
2625 kWebRtcDevSwitchNames, 2623 kWebRtcDevSwitchNames,
2626 arraysize(kWebRtcDevSwitchNames)); 2624 arraysize(kWebRtcDevSwitchNames));
2627 } 2625 }
2628 } 2626 }
2629 #endif // defined(ENABLE_WEBRTC) 2627 #endif // defined(ENABLE_WEBRTC)
2630 2628
2631 } // namespace chrome 2629 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/prefs/prefs_tab_helper.cc » ('j') | content/public/common/web_preferences.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698