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

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

Issue 508823009: Mark SHA-1 as deprecated (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cert_verify_result_sha1
Patch Set: Slight tweak to allow levels of errors Created 6 years, 2 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 "chrome/grit/generated_resources.h" 7 #include "chrome/grit/generated_resources.h"
8 #include "grit/theme_resources.h" 8 #include "grit/theme_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 break; 266 break;
267 case WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT: 267 case WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT:
268 resource_id = IDR_PAGEINFO_WARNING_MAJOR; 268 resource_id = IDR_PAGEINFO_WARNING_MAJOR;
269 break; 269 break;
270 case WebsiteSettings::SITE_IDENTITY_STATUS_ERROR: 270 case WebsiteSettings::SITE_IDENTITY_STATUS_ERROR:
271 resource_id = IDR_PAGEINFO_BAD; 271 resource_id = IDR_PAGEINFO_BAD;
272 break; 272 break;
273 case WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT: 273 case WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT:
274 resource_id = IDR_PAGEINFO_ENTERPRISE_MANAGED; 274 resource_id = IDR_PAGEINFO_ENTERPRISE_MANAGED;
275 break; 275 break;
276 case WebsiteSettings::SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM:
277 resource_id = IDR_PAGEINFO_WARNING_MINOR;
278 break;
276 default: 279 default:
277 NOTREACHED(); 280 NOTREACHED();
278 break; 281 break;
279 } 282 }
280 return resource_id; 283 return resource_id;
281 } 284 }
282 285
283 // static 286 // static
284 const gfx::Image& WebsiteSettingsUI::GetIdentityIcon( 287 const gfx::Image& WebsiteSettingsUI::GetIdentityIcon(
285 WebsiteSettings::SiteIdentityStatus status) { 288 WebsiteSettings::SiteIdentityStatus status) {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 // the first time. 329 // the first time.
327 return IDR_PAGEINFO_INFO; 330 return IDR_PAGEINFO_INFO;
328 } 331 }
329 332
330 // static 333 // static
331 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon( 334 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
332 const base::string16& first_visit) { 335 const base::string16& first_visit) {
333 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 336 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
334 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit)); 337 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
335 } 338 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings.cc ('k') | content/browser/loader/resource_dispatcher_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698