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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 "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/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
15 #include "base/time/time.h" 14 #include "base/time/time.h"
16 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/interstitials/chrome_controller_client.h" 16 #include "chrome/browser/interstitials/chrome_controller_client.h"
18 #include "chrome/browser/interstitials/chrome_metrics_helper.h" 17 #include "chrome/browser/interstitials/chrome_metrics_helper.h"
19 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/renderer_preferences_util.h" 19 #include "chrome/browser/renderer_preferences_util.h"
21 #include "chrome/browser/ssl/cert_report_helper.h" 20 #include "chrome/browser/ssl/cert_report_helper.h"
22 #include "chrome/browser/ssl/ssl_cert_reporter.h" 21 #include "chrome/browser/ssl/ssl_cert_reporter.h"
23 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
24 #include "components/prefs/pref_service.h"
25 #include "components/security_interstitials/core/controller_client.h" 25 #include "components/security_interstitials/core/controller_client.h"
26 #include "components/security_interstitials/core/metrics_helper.h" 26 #include "components/security_interstitials/core/metrics_helper.h"
27 #include "components/security_interstitials/core/ssl_error_ui.h" 27 #include "components/security_interstitials/core/ssl_error_ui.h"
28 #include "content/public/browser/cert_store.h" 28 #include "content/public/browser/cert_store.h"
29 #include "content/public/browser/interstitial_page.h" 29 #include "content/public/browser/interstitial_page.h"
30 #include "content/public/browser/interstitial_page_delegate.h" 30 #include "content/public/browser/interstitial_page_delegate.h"
31 #include "content/public/browser/navigation_entry.h" 31 #include "content/public/browser/navigation_entry.h"
32 #include "content/public/browser/render_process_host.h" 32 #include "content/public/browser/render_process_host.h"
33 #include "content/public/browser/signed_certificate_timestamp_store.h" 33 #include "content/public/browser/signed_certificate_timestamp_store.h"
34 #include "content/public/browser/web_contents.h" 34 #include "content/public/browser/web_contents.h"
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 // static 279 // static
280 bool SSLBlockingPage::IsOverridable(int options_mask, 280 bool SSLBlockingPage::IsOverridable(int options_mask,
281 const Profile* const profile) { 281 const Profile* const profile) {
282 const bool is_overridable = 282 const bool is_overridable =
283 (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) && 283 (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) &&
284 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT) && 284 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT) &&
285 profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed); 285 profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed);
286 return is_overridable; 286 return is_overridable;
287 } 287 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698