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

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

Issue 2299993004: Migrate chrome/browser files to histogram_macros.h includes. (Closed)
Patch Set: Created 4 years, 3 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/site_details.cc ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('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 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 "chrome/browser/ssl/captive_portal_blocking_page.h" 5 #include "chrome/browser/ssl/captive_portal_blocking_page.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram_macros.h"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" 16 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
17 #include "chrome/browser/ssl/cert_report_helper.h" 17 #include "chrome/browser/ssl/cert_report_helper.h"
18 #include "chrome/browser/ssl/ssl_cert_reporter.h" 18 #include "chrome/browser/ssl/ssl_cert_reporter.h"
19 #include "chrome/grit/generated_resources.h" 19 #include "chrome/grit/generated_resources.h"
20 #include "components/captive_portal/captive_portal_detector.h" 20 #include "components/captive_portal/captive_portal_detector.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 certificate_reporting::ErrorReport::USER_DID_NOT_PROCEED); 217 certificate_reporting::ErrorReport::USER_DID_NOT_PROCEED);
218 } 218 }
219 219
220 // Need to explicity deny the certificate via the callback, otherwise memory 220 // Need to explicity deny the certificate via the callback, otherwise memory
221 // is leaked. 221 // is leaked.
222 if (!callback_.is_null()) { 222 if (!callback_.is_null()) {
223 callback_.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL); 223 callback_.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
224 callback_.Reset(); 224 callback_.Reset();
225 } 225 }
226 } 226 }
OLDNEW
« no previous file with comments | « chrome/browser/site_details.cc ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698