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

Side by Side Diff: content/renderer/render_view_impl.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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 settings->setLocalStorageEnabled(prefs.local_storage_enabled); 961 settings->setLocalStorageEnabled(prefs.local_storage_enabled);
962 settings->setSyncXHRInDocumentsEnabled(prefs.sync_xhr_in_documents_enabled); 962 settings->setSyncXHRInDocumentsEnabled(prefs.sync_xhr_in_documents_enabled);
963 WebRuntimeFeatures::enableDatabase(prefs.databases_enabled); 963 WebRuntimeFeatures::enableDatabase(prefs.databases_enabled);
964 settings->setOfflineWebApplicationCacheEnabled( 964 settings->setOfflineWebApplicationCacheEnabled(
965 prefs.application_cache_enabled); 965 prefs.application_cache_enabled);
966 settings->setCaretBrowsingEnabled(prefs.caret_browsing_enabled); 966 settings->setCaretBrowsingEnabled(prefs.caret_browsing_enabled);
967 settings->setHyperlinkAuditingEnabled(prefs.hyperlink_auditing_enabled); 967 settings->setHyperlinkAuditingEnabled(prefs.hyperlink_auditing_enabled);
968 settings->setCookieEnabled(prefs.cookie_enabled); 968 settings->setCookieEnabled(prefs.cookie_enabled);
969 settings->setNavigateOnDragDrop(prefs.navigate_on_drag_drop); 969 settings->setNavigateOnDragDrop(prefs.navigate_on_drag_drop);
970 970
971 settings->setJavaEnabled(prefs.java_enabled);
972
973 // By default, allow_universal_access_from_file_urls is set to false and thus 971 // By default, allow_universal_access_from_file_urls is set to false and thus
974 // we mitigate attacks from local HTML files by not granting file:// URLs 972 // we mitigate attacks from local HTML files by not granting file:// URLs
975 // universal access. Only test shell will enable this. 973 // universal access. Only test shell will enable this.
976 settings->setAllowUniversalAccessFromFileURLs( 974 settings->setAllowUniversalAccessFromFileURLs(
977 prefs.allow_universal_access_from_file_urls); 975 prefs.allow_universal_access_from_file_urls);
978 settings->setAllowFileAccessFromFileURLs( 976 settings->setAllowFileAccessFromFileURLs(
979 prefs.allow_file_access_from_file_urls); 977 prefs.allow_file_access_from_file_urls);
980 978
981 // Enable the web audio API if requested on the command line. 979 // Enable the web audio API if requested on the command line.
982 settings->setWebAudioEnabled(prefs.webaudio_enabled); 980 settings->setWebAudioEnabled(prefs.webaudio_enabled);
(...skipping 2815 matching lines...) Expand 10 before | Expand all | Expand 10 after
3798 std::vector<gfx::Size> sizes; 3796 std::vector<gfx::Size> sizes;
3799 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 3797 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
3800 if (!url.isEmpty()) 3798 if (!url.isEmpty())
3801 urls.push_back( 3799 urls.push_back(
3802 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 3800 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
3803 } 3801 }
3804 SendUpdateFaviconURL(urls); 3802 SendUpdateFaviconURL(urls);
3805 } 3803 }
3806 3804
3807 } // namespace content 3805 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698