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

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 2869383002: Unify safe_browsing* components [1]: move safe_browsing_prefs* (Closed)
Patch Set: fix win bots Created 3 years, 7 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
« no previous file with comments | « chrome/browser/ssl/certificate_reporting_test_utils.cc ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/ssl/ssl_blocking_page.h" 5 #include "chrome/browser/ssl/ssl_blocking_page.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/callback_helpers.h" 11 #include "base/callback_helpers.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/interstitials/chrome_controller_client.h" 17 #include "chrome/browser/interstitials/chrome_controller_client.h"
18 #include "chrome/browser/interstitials/chrome_metrics_helper.h" 18 #include "chrome/browser/interstitials/chrome_metrics_helper.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/renderer_preferences_util.h" 20 #include "chrome/browser/renderer_preferences_util.h"
21 #include "chrome/browser/ssl/cert_report_helper.h" 21 #include "chrome/browser/ssl/cert_report_helper.h"
22 #include "chrome/browser/ssl/ssl_cert_reporter.h" 22 #include "chrome/browser/ssl/ssl_cert_reporter.h"
23 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
25 #include "components/prefs/pref_service.h" 25 #include "components/prefs/pref_service.h"
26 #include "components/safe_browsing_db/safe_browsing_prefs.h" 26 #include "components/safe_browsing/common/safe_browsing_prefs.h"
27 #include "components/security_interstitials/core/controller_client.h" 27 #include "components/security_interstitials/core/controller_client.h"
28 #include "components/security_interstitials/core/metrics_helper.h" 28 #include "components/security_interstitials/core/metrics_helper.h"
29 #include "components/security_interstitials/core/ssl_error_ui.h" 29 #include "components/security_interstitials/core/ssl_error_ui.h"
30 #include "content/public/browser/interstitial_page.h" 30 #include "content/public/browser/interstitial_page.h"
31 #include "content/public/browser/interstitial_page_delegate.h" 31 #include "content/public/browser/interstitial_page_delegate.h"
32 #include "content/public/browser/navigation_entry.h" 32 #include "content/public/browser/navigation_entry.h"
33 #include "content/public/browser/render_process_host.h" 33 #include "content/public/browser/render_process_host.h"
34 #include "content/public/browser/ssl_status.h" 34 #include "content/public/browser/ssl_status.h"
35 #include "content/public/browser/web_contents.h" 35 #include "content/public/browser/web_contents.h"
36 #include "content/public/common/renderer_preferences.h" 36 #include "content/public/common/renderer_preferences.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 306
307 // static 307 // static
308 bool SSLBlockingPage::IsOverridable(int options_mask, 308 bool SSLBlockingPage::IsOverridable(int options_mask,
309 const Profile* const profile) { 309 const Profile* const profile) {
310 const bool is_overridable = 310 const bool is_overridable =
311 (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) && 311 (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) &&
312 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT) && 312 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT) &&
313 profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed); 313 profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed);
314 return is_overridable; 314 return is_overridable;
315 } 315 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/certificate_reporting_test_utils.cc ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698