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

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

Issue 2616553002: Remove obsolete SHA-1 UX elements (Closed)
Patch Set: Final nits Created 3 years, 11 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_ui.h" 5 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
9 #include "chrome/browser/plugins/plugin_utils.h" 9 #include "chrome/browser/plugins/plugin_utils.h"
10 #include "chrome/browser/plugins/plugins_field_trial.h" 10 #include "chrome/browser/plugins/plugins_field_trial.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_MALWARE_SUMMARY, 185 return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_MALWARE_SUMMARY,
186 IDS_WEBSITE_SETTINGS_MALWARE_DETAILS); 186 IDS_WEBSITE_SETTINGS_MALWARE_DETAILS);
187 case WebsiteSettings::SITE_IDENTITY_STATUS_SOCIAL_ENGINEERING: 187 case WebsiteSettings::SITE_IDENTITY_STATUS_SOCIAL_ENGINEERING:
188 return CreateSecurityDescription( 188 return CreateSecurityDescription(
189 IDS_WEBSITE_SETTINGS_SOCIAL_ENGINEERING_SUMMARY, 189 IDS_WEBSITE_SETTINGS_SOCIAL_ENGINEERING_SUMMARY,
190 IDS_WEBSITE_SETTINGS_SOCIAL_ENGINEERING_DETAILS); 190 IDS_WEBSITE_SETTINGS_SOCIAL_ENGINEERING_DETAILS);
191 case WebsiteSettings::SITE_IDENTITY_STATUS_UNWANTED_SOFTWARE: 191 case WebsiteSettings::SITE_IDENTITY_STATUS_UNWANTED_SOFTWARE:
192 return CreateSecurityDescription( 192 return CreateSecurityDescription(
193 IDS_WEBSITE_SETTINGS_UNWANTED_SOFTWARE_SUMMARY, 193 IDS_WEBSITE_SETTINGS_UNWANTED_SOFTWARE_SUMMARY,
194 IDS_WEBSITE_SETTINGS_UNWANTED_SOFTWARE_DETAILS); 194 IDS_WEBSITE_SETTINGS_UNWANTED_SOFTWARE_DETAILS);
195 case WebsiteSettings:: 195 case WebsiteSettings::SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM:
196 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR:
197 case WebsiteSettings::
198 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR:
199 case WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN: 196 case WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN:
200 case WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT: 197 case WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT:
201 default: 198 default:
202 return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_NOT_SECURE_SUMMARY, 199 return CreateSecurityDescription(IDS_WEBSITE_SETTINGS_NOT_SECURE_SUMMARY,
203 IDS_WEBSITE_SETTINGS_NOT_SECURE_DETAILS); 200 IDS_WEBSITE_SETTINGS_NOT_SECURE_DETAILS);
204 } 201 }
205 } 202 }
206 203
207 WebsiteSettingsUI::~WebsiteSettingsUI() { 204 WebsiteSettingsUI::~WebsiteSettingsUI() {
208 } 205 }
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 break; 338 break;
342 case WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT: 339 case WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT:
343 resource_id = IDR_PAGEINFO_WARNING_MAJOR; 340 resource_id = IDR_PAGEINFO_WARNING_MAJOR;
344 break; 341 break;
345 case WebsiteSettings::SITE_IDENTITY_STATUS_ERROR: 342 case WebsiteSettings::SITE_IDENTITY_STATUS_ERROR:
346 resource_id = IDR_PAGEINFO_BAD; 343 resource_id = IDR_PAGEINFO_BAD;
347 break; 344 break;
348 case WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT: 345 case WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT:
349 resource_id = IDR_PAGEINFO_ENTERPRISE_MANAGED; 346 resource_id = IDR_PAGEINFO_ENTERPRISE_MANAGED;
350 break; 347 break;
351 case WebsiteSettings:: 348 case WebsiteSettings::SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM:
352 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR:
353 resource_id = IDR_PAGEINFO_WARNING_MINOR; 349 resource_id = IDR_PAGEINFO_WARNING_MINOR;
354 break; 350 break;
355 case WebsiteSettings::
356 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR:
357 resource_id = IDR_PAGEINFO_BAD;
358 break;
359 default: 351 default:
360 NOTREACHED(); 352 NOTREACHED();
361 break; 353 break;
362 } 354 }
363 return resource_id; 355 return resource_id;
364 } 356 }
365 357
366 // static 358 // static
367 const gfx::Image& WebsiteSettingsUI::GetIdentityIcon( 359 const gfx::Image& WebsiteSettingsUI::GetIdentityIcon(
368 WebsiteSettings::SiteIdentityStatus status) { 360 WebsiteSettings::SiteIdentityStatus status) {
(...skipping 25 matching lines...) Expand all
394 } 386 }
395 return resource_id; 387 return resource_id;
396 } 388 }
397 389
398 // static 390 // static
399 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon( 391 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
400 WebsiteSettings::SiteConnectionStatus status) { 392 WebsiteSettings::SiteConnectionStatus status) {
401 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 393 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
402 return rb.GetNativeImageNamed(GetConnectionIconID(status)); 394 return rb.GetNativeImageNamed(GetConnectionIconID(status));
403 } 395 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698