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

Side by Side Diff: content/shell/renderer/layout_test/blink_test_helpers.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/shell/renderer/layout_test/blink_test_helpers.h" 5 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
(...skipping 14 matching lines...) Expand all
25 to->javascript_can_access_clipboard = from.java_script_can_access_clipboard; 25 to->javascript_can_access_clipboard = from.java_script_can_access_clipboard;
26 to->xss_auditor_enabled = from.xss_auditor_enabled; 26 to->xss_auditor_enabled = from.xss_auditor_enabled;
27 to->editing_behavior = static_cast<EditingBehavior>(from.editing_behavior); 27 to->editing_behavior = static_cast<EditingBehavior>(from.editing_behavior);
28 to->default_font_size = from.default_font_size; 28 to->default_font_size = from.default_font_size;
29 to->minimum_font_size = from.minimum_font_size; 29 to->minimum_font_size = from.minimum_font_size;
30 to->default_encoding = from.default_text_encoding_name.utf8().data(); 30 to->default_encoding = from.default_text_encoding_name.utf8().data();
31 to->javascript_enabled = from.java_script_enabled; 31 to->javascript_enabled = from.java_script_enabled;
32 to->supports_multiple_windows = from.supports_multiple_windows; 32 to->supports_multiple_windows = from.supports_multiple_windows;
33 to->loads_images_automatically = from.loads_images_automatically; 33 to->loads_images_automatically = from.loads_images_automatically;
34 to->plugins_enabled = from.plugins_enabled; 34 to->plugins_enabled = from.plugins_enabled;
35 to->java_enabled = from.java_enabled;
36 to->application_cache_enabled = from.offline_web_application_cache_enabled; 35 to->application_cache_enabled = from.offline_web_application_cache_enabled;
37 to->tabs_to_links = from.tabs_to_links; 36 to->tabs_to_links = from.tabs_to_links;
38 to->experimental_webgl_enabled = from.experimental_webgl_enabled; 37 to->experimental_webgl_enabled = from.experimental_webgl_enabled;
39 // experimentalCSSRegionsEnabled is deprecated and ignored. 38 // experimentalCSSRegionsEnabled is deprecated and ignored.
40 to->hyperlink_auditing_enabled = from.hyperlink_auditing_enabled; 39 to->hyperlink_auditing_enabled = from.hyperlink_auditing_enabled;
41 to->caret_browsing_enabled = from.caret_browsing_enabled; 40 to->caret_browsing_enabled = from.caret_browsing_enabled;
42 to->allow_displaying_insecure_content = 41 to->allow_displaying_insecure_content =
43 from.allow_display_of_insecure_content; 42 from.allow_display_of_insecure_content;
44 to->allow_running_insecure_content = from.allow_running_of_insecure_content; 43 to->allow_running_insecure_content = from.allow_running_of_insecure_content;
45 to->should_respect_image_orientation = from.should_respect_image_orientation; 44 to->should_respect_image_orientation = from.should_respect_image_orientation;
(...skipping 20 matching lines...) Expand all
66 prefs->allow_universal_access_from_file_urls = true; 65 prefs->allow_universal_access_from_file_urls = true;
67 prefs->dom_paste_enabled = true; 66 prefs->dom_paste_enabled = true;
68 prefs->javascript_can_access_clipboard = true; 67 prefs->javascript_can_access_clipboard = true;
69 prefs->xslt_enabled = true; 68 prefs->xslt_enabled = true;
70 prefs->xss_auditor_enabled = false; 69 prefs->xss_auditor_enabled = false;
71 #if defined(OS_MACOSX) 70 #if defined(OS_MACOSX)
72 prefs->editing_behavior = EDITING_BEHAVIOR_MAC; 71 prefs->editing_behavior = EDITING_BEHAVIOR_MAC;
73 #else 72 #else
74 prefs->editing_behavior = EDITING_BEHAVIOR_WIN; 73 prefs->editing_behavior = EDITING_BEHAVIOR_WIN;
75 #endif 74 #endif
76 prefs->java_enabled = false;
77 prefs->application_cache_enabled = true; 75 prefs->application_cache_enabled = true;
78 prefs->tabs_to_links = false; 76 prefs->tabs_to_links = false;
79 prefs->hyperlink_auditing_enabled = false; 77 prefs->hyperlink_auditing_enabled = false;
80 prefs->allow_displaying_insecure_content = true; 78 prefs->allow_displaying_insecure_content = true;
81 prefs->allow_running_insecure_content = false; 79 prefs->allow_running_insecure_content = false;
82 prefs->disable_reading_from_canvas = false; 80 prefs->disable_reading_from_canvas = false;
83 prefs->strict_mixed_content_checking = false; 81 prefs->strict_mixed_content_checking = false;
84 prefs->strict_powerful_feature_restrictions = false; 82 prefs->strict_powerful_feature_restrictions = false;
85 prefs->webgl_errors_to_console_enabled = false; 83 prefs->webgl_errors_to_console_enabled = false;
86 base::string16 serif; 84 base::string16 serif;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 *base::CommandLine::ForCurrentProcess(); 125 *base::CommandLine::ForCurrentProcess();
128 if (command_line.HasSwitch(switches::kRegisterFontFiles)) { 126 if (command_line.HasSwitch(switches::kRegisterFontFiles)) {
129 files = base::SplitString( 127 files = base::SplitString(
130 command_line.GetSwitchValueASCII(switches::kRegisterFontFiles), 128 command_line.GetSwitchValueASCII(switches::kRegisterFontFiles),
131 ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); 129 ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
132 } 130 }
133 return files; 131 return files;
134 } 132 }
135 133
136 } // namespace content 134 } // namespace content
OLDNEW
« content/public/common/web_preferences.cc ('K') | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698