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

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

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 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 (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 #ifndef CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 5 #ifndef CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
6 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 6 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "base/task/cancelable_task_tracker.h" 14 #include "base/task/cancelable_task_tracker.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "chrome/browser/interstitials/security_interstitial_page.h" 16 #include "chrome/browser/interstitials/security_interstitial_page.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ssl/ssl_cert_reporter.h" 18 #include "chrome/browser/ssl/ssl_cert_reporter.h"
19 #include "components/certificate_reporting/error_report.h" 19 #include "components/certificate_reporting/error_report.h"
20 #include "content/public/browser/certificate_request_result_type.h" 20 #include "content/public/browser/certificate_request_result_type.h"
21 #include "extensions/features/features.h"
21 #include "net/ssl/ssl_info.h" 22 #include "net/ssl/ssl_info.h"
22 #include "url/gurl.h" 23 #include "url/gurl.h"
23 24
24 #if defined(ENABLE_EXTENSIONS) 25 #if BUILDFLAG(ENABLE_EXTENSIONS)
25 namespace extensions { 26 namespace extensions {
26 class ExperienceSamplingEvent; 27 class ExperienceSamplingEvent;
27 } 28 }
28 #endif 29 #endif
29 30
30 namespace policy { 31 namespace policy {
31 class PolicyTest_SSLErrorOverridingDisallowed_Test; 32 class PolicyTest_SSLErrorOverridingDisallowed_Test;
32 } 33 }
33 34
34 namespace security_interstitials { 35 namespace security_interstitials {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 // expired. 117 // expired.
117 const bool expired_but_previously_allowed_; 118 const bool expired_but_previously_allowed_;
118 119
119 const std::unique_ptr<CertReportHelper> cert_report_helper_; 120 const std::unique_ptr<CertReportHelper> cert_report_helper_;
120 const std::unique_ptr<security_interstitials::SSLErrorUI> ssl_error_ui_; 121 const std::unique_ptr<security_interstitials::SSLErrorUI> ssl_error_ui_;
121 122
122 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage); 123 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
123 }; 124 };
124 125
125 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 126 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698