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

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

Issue 1583813003: Remove obsolete histogram values from SSL.InsecureContent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mpearson comment Created 4 years, 11 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/web_content_settings.h" 5 #include "components/test_runner/web_content_settings.h"
6 6
7 #include "components/test_runner/test_common.h" 7 #include "components/test_runner/test_common.h"
8 #include "components/test_runner/web_test_delegate.h" 8 #include "components/test_runner/web_test_delegate.h"
9 #include "third_party/WebKit/public/platform/WebCString.h" 9 #include "third_party/WebKit/public/platform/WebCString.h"
10 #include "third_party/WebKit/public/platform/WebURL.h" 10 #include "third_party/WebKit/public/platform/WebURL.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 bool WebContentSettings::allowStorage(bool) { 54 bool WebContentSettings::allowStorage(bool) {
55 return storage_allowed_; 55 return storage_allowed_;
56 } 56 }
57 57
58 bool WebContentSettings::allowPlugins(bool enabled_per_settings) { 58 bool WebContentSettings::allowPlugins(bool enabled_per_settings) {
59 return enabled_per_settings && plugins_allowed_; 59 return enabled_per_settings && plugins_allowed_;
60 } 60 }
61 61
62 bool WebContentSettings::allowDisplayingInsecureContent( 62 bool WebContentSettings::allowDisplayingInsecureContent(
63 bool enabled_per_settings, 63 bool enabled_per_settings,
64 const blink::WebSecurityOrigin&,
65 const blink::WebURL&) { 64 const blink::WebURL&) {
66 return enabled_per_settings || displaying_insecure_content_allowed_; 65 return enabled_per_settings || displaying_insecure_content_allowed_;
67 } 66 }
68 67
69 bool WebContentSettings::allowRunningInsecureContent( 68 bool WebContentSettings::allowRunningInsecureContent(
70 bool enabled_per_settings, 69 bool enabled_per_settings,
71 const blink::WebSecurityOrigin&, 70 const blink::WebSecurityOrigin&,
72 const blink::WebURL&) { 71 const blink::WebURL&) {
73 return enabled_per_settings || running_insecure_content_allowed_; 72 return enabled_per_settings || running_insecure_content_allowed_;
74 } 73 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 images_allowed_ = true; 113 images_allowed_ = true;
115 media_allowed_ = true; 114 media_allowed_ = true;
116 scripts_allowed_ = true; 115 scripts_allowed_ = true;
117 storage_allowed_ = true; 116 storage_allowed_ = true;
118 plugins_allowed_ = true; 117 plugins_allowed_ = true;
119 displaying_insecure_content_allowed_ = false; 118 displaying_insecure_content_allowed_ = false;
120 running_insecure_content_allowed_ = false; 119 running_insecure_content_allowed_ = false;
121 } 120 }
122 121
123 } // namespace test_runner 122 } // namespace test_runner
OLDNEW
« no previous file with comments | « components/test_runner/web_content_settings.h ('k') | third_party/WebKit/Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698