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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings.cc

Issue 1539043002: Pull SecurityStateModel out into a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unit test debugging Created 4 years, 12 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/ui/website_settings/website_settings.h" 5 #include "chrome/browser/ui/website_settings/website_settings.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #endif 60 #endif
61 61
62 #if !defined(OS_ANDROID) 62 #if !defined(OS_ANDROID)
63 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h " 63 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h "
64 #endif 64 #endif
65 65
66 using base::ASCIIToUTF16; 66 using base::ASCIIToUTF16;
67 using base::UTF8ToUTF16; 67 using base::UTF8ToUTF16;
68 using base::UTF16ToUTF8; 68 using base::UTF16ToUTF8;
69 using content::BrowserThread; 69 using content::BrowserThread;
70 using security_state::SecurityStateModel;
70 71
71 namespace { 72 namespace {
72 73
73 // Events for UMA. Do not reorder or change! 74 // Events for UMA. Do not reorder or change!
74 enum SSLCertificateDecisionsDidRevoke { 75 enum SSLCertificateDecisionsDidRevoke {
75 USER_CERT_DECISIONS_NOT_REVOKED = 0, 76 USER_CERT_DECISIONS_NOT_REVOKED = 0,
76 USER_CERT_DECISIONS_REVOKED, 77 USER_CERT_DECISIONS_REVOKED,
77 END_OF_SSL_CERTIFICATE_DECISIONS_DID_REVOKE_ENUM 78 END_OF_SSL_CERTIFICATE_DECISIONS_DID_REVOKE_ENUM
78 }; 79 };
79 80
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 info.connection_status = site_connection_status_; 701 info.connection_status = site_connection_status_;
701 info.connection_status_description = 702 info.connection_status_description =
702 UTF16ToUTF8(site_connection_details_); 703 UTF16ToUTF8(site_connection_details_);
703 info.identity_status = site_identity_status_; 704 info.identity_status = site_identity_status_;
704 info.identity_status_description = 705 info.identity_status_description =
705 UTF16ToUTF8(site_identity_details_); 706 UTF16ToUTF8(site_identity_details_);
706 info.cert_id = cert_id_; 707 info.cert_id = cert_id_;
707 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 708 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
708 ui_->SetIdentityInfo(info); 709 ui_->SetIdentityInfo(info);
709 } 710 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698