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

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

Issue 1349843003: Display active mixed content as error instead of info in WebsiteSettings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: check icon id in unit tests also Created 5 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 (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 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 632
633 // By default select the permissions tab that displays all the site 633 // By default select the permissions tab that displays all the site
634 // permissions. In case of a connection error or an issue with the 634 // permissions. In case of a connection error or an issue with the
635 // certificate presented by the website, select the connection tab to draw 635 // certificate presented by the website, select the connection tab to draw
636 // the user's attention to the issue. If the site does not provide a 636 // the user's attention to the issue. If the site does not provide a
637 // certificate because it was loaded over an unencrypted connection, don't 637 // certificate because it was loaded over an unencrypted connection, don't
638 // select the connection tab. 638 // select the connection tab.
639 WebsiteSettingsUI::TabId tab_id = WebsiteSettingsUI::TAB_ID_PERMISSIONS; 639 WebsiteSettingsUI::TabId tab_id = WebsiteSettingsUI::TAB_ID_PERMISSIONS;
640 if (site_connection_status_ == SITE_CONNECTION_STATUS_ENCRYPTED_ERROR || 640 if (site_connection_status_ == SITE_CONNECTION_STATUS_ENCRYPTED_ERROR ||
641 site_connection_status_ == SITE_CONNECTION_STATUS_MIXED_CONTENT || 641 site_connection_status_ == SITE_CONNECTION_STATUS_MIXED_CONTENT ||
642 site_connection_status_ == SITE_CONNECTION_STATUS_MIXED_SCRIPT ||
642 site_identity_status_ == SITE_IDENTITY_STATUS_ERROR || 643 site_identity_status_ == SITE_IDENTITY_STATUS_ERROR ||
643 site_identity_status_ == SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN || 644 site_identity_status_ == SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN ||
644 site_identity_status_ == SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT || 645 site_identity_status_ == SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT ||
645 site_identity_status_ == 646 site_identity_status_ ==
646 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM) { 647 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM) {
647 tab_id = WebsiteSettingsUI::TAB_ID_CONNECTION; 648 tab_id = WebsiteSettingsUI::TAB_ID_CONNECTION;
648 RecordWebsiteSettingsAction( 649 RecordWebsiteSettingsAction(
649 WEBSITE_SETTINGS_CONNECTION_TAB_SHOWN_IMMEDIATELY); 650 WEBSITE_SETTINGS_CONNECTION_TAB_SHOWN_IMMEDIATELY);
650 } 651 }
651 ui_->SetSelectedTab(tab_id); 652 ui_->SetSelectedTab(tab_id);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 info.connection_status = site_connection_status_; 733 info.connection_status = site_connection_status_;
733 info.connection_status_description = 734 info.connection_status_description =
734 UTF16ToUTF8(site_connection_details_); 735 UTF16ToUTF8(site_connection_details_);
735 info.identity_status = site_identity_status_; 736 info.identity_status = site_identity_status_;
736 info.identity_status_description = 737 info.identity_status_description =
737 UTF16ToUTF8(site_identity_details_); 738 UTF16ToUTF8(site_identity_details_);
738 info.cert_id = cert_id_; 739 info.cert_id = cert_id_;
739 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 740 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
740 ui_->SetIdentityInfo(info); 741 ui_->SetIdentityInfo(info);
741 } 742 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698