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

Side by Side Diff: components/test_runner/test_runner.cc

Issue 1417033010: Adding <keygen> Content Setting (Blink) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_core
Patch Set: Clean up code. Created 5 years, 1 month 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 "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 void DumpTitleChanges(); 234 void DumpTitleChanges();
235 void DumpCreateView(); 235 void DumpCreateView();
236 void SetCanOpenWindows(); 236 void SetCanOpenWindows();
237 void DumpResourceLoadCallbacks(); 237 void DumpResourceLoadCallbacks();
238 void DumpResourceRequestCallbacks(); 238 void DumpResourceRequestCallbacks();
239 void DumpResourceResponseMIMETypes(); 239 void DumpResourceResponseMIMETypes();
240 void SetImagesAllowed(bool allowed); 240 void SetImagesAllowed(bool allowed);
241 void SetMediaAllowed(bool allowed); 241 void SetMediaAllowed(bool allowed);
242 void SetScriptsAllowed(bool allowed); 242 void SetScriptsAllowed(bool allowed);
243 void SetStorageAllowed(bool allowed); 243 void SetStorageAllowed(bool allowed);
244 void SetKeygenAllowed(bool allowed);
244 void SetPluginsAllowed(bool allowed); 245 void SetPluginsAllowed(bool allowed);
245 void SetAllowDisplayOfInsecureContent(bool allowed); 246 void SetAllowDisplayOfInsecureContent(bool allowed);
246 void SetAllowRunningOfInsecureContent(bool allowed); 247 void SetAllowRunningOfInsecureContent(bool allowed);
247 void DumpPermissionClientCallbacks(); 248 void DumpPermissionClientCallbacks();
248 void DumpWindowStatusChanges(); 249 void DumpWindowStatusChanges();
249 void DumpProgressFinishedCallback(); 250 void DumpProgressFinishedCallback();
250 void DumpSpellCheckCallbacks(); 251 void DumpSpellCheckCallbacks();
251 void DumpBackForwardList(); 252 void DumpBackForwardList();
252 void DumpSelectionRect(); 253 void DumpSelectionRect();
253 void SetPrinting(); 254 void SetPrinting();
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 .SetMethod("dumpResourceLoadCallbacks", 490 .SetMethod("dumpResourceLoadCallbacks",
490 &TestRunnerBindings::DumpResourceLoadCallbacks) 491 &TestRunnerBindings::DumpResourceLoadCallbacks)
491 .SetMethod("dumpResourceRequestCallbacks", 492 .SetMethod("dumpResourceRequestCallbacks",
492 &TestRunnerBindings::DumpResourceRequestCallbacks) 493 &TestRunnerBindings::DumpResourceRequestCallbacks)
493 .SetMethod("dumpResourceResponseMIMETypes", 494 .SetMethod("dumpResourceResponseMIMETypes",
494 &TestRunnerBindings::DumpResourceResponseMIMETypes) 495 &TestRunnerBindings::DumpResourceResponseMIMETypes)
495 .SetMethod("setImagesAllowed", &TestRunnerBindings::SetImagesAllowed) 496 .SetMethod("setImagesAllowed", &TestRunnerBindings::SetImagesAllowed)
496 .SetMethod("setMediaAllowed", &TestRunnerBindings::SetMediaAllowed) 497 .SetMethod("setMediaAllowed", &TestRunnerBindings::SetMediaAllowed)
497 .SetMethod("setScriptsAllowed", &TestRunnerBindings::SetScriptsAllowed) 498 .SetMethod("setScriptsAllowed", &TestRunnerBindings::SetScriptsAllowed)
498 .SetMethod("setStorageAllowed", &TestRunnerBindings::SetStorageAllowed) 499 .SetMethod("setStorageAllowed", &TestRunnerBindings::SetStorageAllowed)
500 .SetMethod("setKeygenAllowed", &TestRunnerBindings::SetKeygenAllowed)
499 .SetMethod("setPluginsAllowed", &TestRunnerBindings::SetPluginsAllowed) 501 .SetMethod("setPluginsAllowed", &TestRunnerBindings::SetPluginsAllowed)
500 .SetMethod("setAllowDisplayOfInsecureContent", 502 .SetMethod("setAllowDisplayOfInsecureContent",
501 &TestRunnerBindings::SetAllowDisplayOfInsecureContent) 503 &TestRunnerBindings::SetAllowDisplayOfInsecureContent)
502 .SetMethod("setAllowRunningOfInsecureContent", 504 .SetMethod("setAllowRunningOfInsecureContent",
503 &TestRunnerBindings::SetAllowRunningOfInsecureContent) 505 &TestRunnerBindings::SetAllowRunningOfInsecureContent)
504 .SetMethod("dumpPermissionClientCallbacks", 506 .SetMethod("dumpPermissionClientCallbacks",
505 &TestRunnerBindings::DumpPermissionClientCallbacks) 507 &TestRunnerBindings::DumpPermissionClientCallbacks)
506 .SetMethod("dumpWindowStatusChanges", 508 .SetMethod("dumpWindowStatusChanges",
507 &TestRunnerBindings::DumpWindowStatusChanges) 509 &TestRunnerBindings::DumpWindowStatusChanges)
508 .SetMethod("dumpProgressFinishedCallback", 510 .SetMethod("dumpProgressFinishedCallback",
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
1179 void TestRunnerBindings::SetScriptsAllowed(bool allowed) { 1181 void TestRunnerBindings::SetScriptsAllowed(bool allowed) {
1180 if (runner_) 1182 if (runner_)
1181 runner_->SetScriptsAllowed(allowed); 1183 runner_->SetScriptsAllowed(allowed);
1182 } 1184 }
1183 1185
1184 void TestRunnerBindings::SetStorageAllowed(bool allowed) { 1186 void TestRunnerBindings::SetStorageAllowed(bool allowed) {
1185 if (runner_) 1187 if (runner_)
1186 runner_->SetStorageAllowed(allowed); 1188 runner_->SetStorageAllowed(allowed);
1187 } 1189 }
1188 1190
1191 void TestRunnerBindings::SetKeygenAllowed(bool allowed) {
1192 if (runner_)
1193 runner_->SetKeygenAllowed(allowed);
1194 }
1195
1189 void TestRunnerBindings::SetPluginsAllowed(bool allowed) { 1196 void TestRunnerBindings::SetPluginsAllowed(bool allowed) {
1190 if (runner_) 1197 if (runner_)
1191 runner_->SetPluginsAllowed(allowed); 1198 runner_->SetPluginsAllowed(allowed);
1192 } 1199 }
1193 1200
1194 void TestRunnerBindings::SetAllowDisplayOfInsecureContent(bool allowed) { 1201 void TestRunnerBindings::SetAllowDisplayOfInsecureContent(bool allowed) {
1195 if (runner_) 1202 if (runner_)
1196 runner_->SetAllowDisplayOfInsecureContent(allowed); 1203 runner_->SetAllowDisplayOfInsecureContent(allowed);
1197 } 1204 }
1198 1205
(...skipping 1520 matching lines...) Expand 10 before | Expand all | Expand 10 after
2719 } 2726 }
2720 2727
2721 void TestRunner::SetScriptsAllowed(bool allowed) { 2728 void TestRunner::SetScriptsAllowed(bool allowed) {
2722 web_content_settings_->SetScriptsAllowed(allowed); 2729 web_content_settings_->SetScriptsAllowed(allowed);
2723 } 2730 }
2724 2731
2725 void TestRunner::SetStorageAllowed(bool allowed) { 2732 void TestRunner::SetStorageAllowed(bool allowed) {
2726 web_content_settings_->SetStorageAllowed(allowed); 2733 web_content_settings_->SetStorageAllowed(allowed);
2727 } 2734 }
2728 2735
2736 void TestRunner::SetKeygenAllowed(bool allowed) {
2737 web_content_settings_->SetKeygenAllowed(allowed);
2738 }
2739
2729 void TestRunner::SetPluginsAllowed(bool allowed) { 2740 void TestRunner::SetPluginsAllowed(bool allowed) {
2730 web_content_settings_->SetPluginsAllowed(allowed); 2741 web_content_settings_->SetPluginsAllowed(allowed);
2731 } 2742 }
2732 2743
2733 void TestRunner::SetAllowDisplayOfInsecureContent(bool allowed) { 2744 void TestRunner::SetAllowDisplayOfInsecureContent(bool allowed) {
2734 web_content_settings_->SetDisplayingInsecureContentAllowed(allowed); 2745 web_content_settings_->SetDisplayingInsecureContentAllowed(allowed);
2735 } 2746 }
2736 2747
2737 void TestRunner::SetAllowRunningOfInsecureContent(bool allowed) { 2748 void TestRunner::SetAllowRunningOfInsecureContent(bool allowed) {
2738 web_content_settings_->SetRunningInsecureContentAllowed(allowed); 2749 web_content_settings_->SetRunningInsecureContentAllowed(allowed);
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
3153 } 3164 }
3154 3165
3155 void TestRunner::DidLosePointerLockInternal() { 3166 void TestRunner::DidLosePointerLockInternal() {
3156 bool was_locked = pointer_locked_; 3167 bool was_locked = pointer_locked_;
3157 pointer_locked_ = false; 3168 pointer_locked_ = false;
3158 if (was_locked) 3169 if (was_locked)
3159 web_view_->didLosePointerLock(); 3170 web_view_->didLosePointerLock();
3160 } 3171 }
3161 3172
3162 } // namespace test_runner 3173 } // namespace test_runner
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698