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

Side by Side Diff: chrome/browser/ssl/ssl_error_handler.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
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/ssl_error_handler.h" 5 #include "chrome/browser/ssl/ssl_error_handler.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/metrics/field_trial.h" 12 #include "base/metrics/field_trial.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
15 #include "base/time/clock.h" 15 #include "base/time/clock.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/ssl/bad_clock_blocking_page.h" 19 #include "chrome/browser/ssl/bad_clock_blocking_page.h"
20 #include "chrome/browser/ssl/ssl_blocking_page.h" 20 #include "chrome/browser/ssl/ssl_blocking_page.h"
21 #include "chrome/browser/ssl/ssl_cert_reporter.h" 21 #include "chrome/browser/ssl/ssl_cert_reporter.h"
22 #include "components/ssl_errors/error_classification.h" 22 #include "components/ssl_errors/error_classification.h"
23 #include "components/ssl_errors/error_info.h" 23 #include "components/ssl_errors/error_info.h"
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 base::ResetAndReturn(&callback_) 413 base::ResetAndReturn(&callback_)
414 .Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY); 414 .Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY);
415 } 415 }
416 if (common_name_mismatch_handler_) { 416 if (common_name_mismatch_handler_) {
417 common_name_mismatch_handler_->Cancel(); 417 common_name_mismatch_handler_->Cancel();
418 common_name_mismatch_handler_.reset(); 418 common_name_mismatch_handler_.reset();
419 } 419 }
420 // Deletes |this| and also destroys the timer. 420 // Deletes |this| and also destroys the timer.
421 web_contents_->RemoveUserData(UserDataKey()); 421 web_contents_->RemoveUserData(UserDataKey());
422 } 422 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/browser/supervised_user/chromeos/manager_password_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698