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

Side by Side Diff: components/test_runner/test_runner.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/test_runner/test_runner.h" 5 #include "components/test_runner/test_runner.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "components/test_runner/mock_credential_manager_client.h" 10 #include "components/test_runner/mock_credential_manager_client.h"
(...skipping 2525 matching lines...) Expand 10 before | Expand all | Expand 10 after
2536 prefs->default_text_encoding_name = 2536 prefs->default_text_encoding_name =
2537 V8StringToWebString(value->ToString(isolate)); 2537 V8StringToWebString(value->ToString(isolate));
2538 } else if (key == "WebKitJavaScriptEnabled") { 2538 } else if (key == "WebKitJavaScriptEnabled") {
2539 prefs->java_script_enabled = value->BooleanValue(); 2539 prefs->java_script_enabled = value->BooleanValue();
2540 } else if (key == "WebKitSupportsMultipleWindows") { 2540 } else if (key == "WebKitSupportsMultipleWindows") {
2541 prefs->supports_multiple_windows = value->BooleanValue(); 2541 prefs->supports_multiple_windows = value->BooleanValue();
2542 } else if (key == "WebKitDisplayImagesKey") { 2542 } else if (key == "WebKitDisplayImagesKey") {
2543 prefs->loads_images_automatically = value->BooleanValue(); 2543 prefs->loads_images_automatically = value->BooleanValue();
2544 } else if (key == "WebKitPluginsEnabled") { 2544 } else if (key == "WebKitPluginsEnabled") {
2545 prefs->plugins_enabled = value->BooleanValue(); 2545 prefs->plugins_enabled = value->BooleanValue();
2546 } else if (key == "WebKitJavaEnabled") {
2547 prefs->java_enabled = value->BooleanValue();
2548 } else if (key == "WebKitOfflineWebApplicationCacheEnabled") { 2546 } else if (key == "WebKitOfflineWebApplicationCacheEnabled") {
2549 prefs->offline_web_application_cache_enabled = value->BooleanValue(); 2547 prefs->offline_web_application_cache_enabled = value->BooleanValue();
2550 } else if (key == "WebKitTabToLinksPreferenceKey") { 2548 } else if (key == "WebKitTabToLinksPreferenceKey") {
2551 prefs->tabs_to_links = value->BooleanValue(); 2549 prefs->tabs_to_links = value->BooleanValue();
2552 } else if (key == "WebKitWebGLEnabled") { 2550 } else if (key == "WebKitWebGLEnabled") {
2553 prefs->experimental_webgl_enabled = value->BooleanValue(); 2551 prefs->experimental_webgl_enabled = value->BooleanValue();
2554 } else if (key == "WebKitCSSRegionsEnabled") { 2552 } else if (key == "WebKitCSSRegionsEnabled") {
2555 prefs->experimental_css_regions_enabled = value->BooleanValue(); 2553 prefs->experimental_css_regions_enabled = value->BooleanValue();
2556 } else if (key == "WebKitCSSGridLayoutEnabled") { 2554 } else if (key == "WebKitCSSGridLayoutEnabled") {
2557 prefs->experimental_css_grid_layout_enabled = value->BooleanValue(); 2555 prefs->experimental_css_grid_layout_enabled = value->BooleanValue();
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
3068 } 3066 }
3069 3067
3070 void TestRunner::DidLosePointerLockInternal() { 3068 void TestRunner::DidLosePointerLockInternal() {
3071 bool was_locked = pointer_locked_; 3069 bool was_locked = pointer_locked_;
3072 pointer_locked_ = false; 3070 pointer_locked_ = false;
3073 if (was_locked) 3071 if (was_locked)
3074 web_view_->didLosePointerLock(); 3072 web_view_->didLosePointerLock();
3075 } 3073 }
3076 3074
3077 } // namespace test_runner 3075 } // namespace test_runner
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698