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

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

Issue 1432573002: Adding <keygen> Content Setting (Android UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_ui
Patch Set: Fix rebase across multiple ancestors. Created 5 years 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 CONTENT_SETTINGS_TYPE_JAVASCRIPT, 89 CONTENT_SETTINGS_TYPE_JAVASCRIPT,
90 CONTENT_SETTINGS_TYPE_POPUPS, 90 CONTENT_SETTINGS_TYPE_POPUPS,
91 CONTENT_SETTINGS_TYPE_FULLSCREEN, 91 CONTENT_SETTINGS_TYPE_FULLSCREEN,
92 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 92 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
93 CONTENT_SETTINGS_TYPE_PLUGINS, 93 CONTENT_SETTINGS_TYPE_PLUGINS,
94 CONTENT_SETTINGS_TYPE_MOUSELOCK, 94 CONTENT_SETTINGS_TYPE_MOUSELOCK,
95 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, 95 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
96 #if defined(OS_ANDROID) 96 #if defined(OS_ANDROID)
97 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, 97 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
98 #endif 98 #endif
99 CONTENT_SETTINGS_TYPE_KEYGEN,
99 }; 100 };
100 101
101 // Returns true if any of the given statuses match |status|. 102 // Returns true if any of the given statuses match |status|.
102 bool CertificateTransparencyStatusMatchAny( 103 bool CertificateTransparencyStatusMatchAny(
103 const std::vector<net::ct::SCTVerifyStatus>& sct_verify_statuses, 104 const std::vector<net::ct::SCTVerifyStatus>& sct_verify_statuses,
104 net::ct::SCTVerifyStatus status) { 105 net::ct::SCTVerifyStatus status) {
105 for (const auto& verify_status : sct_verify_statuses) { 106 for (const auto& verify_status : sct_verify_statuses) {
106 if (verify_status == status) 107 if (verify_status == status)
107 return true; 108 return true;
108 } 109 }
(...skipping 591 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