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

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

Issue 469003004: Revert "Add button to page info to revoke user certificate decisions." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
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 "grit/generated_resources.h" 7 #include "grit/generated_resources.h"
8 #include "grit/theme_resources.h" 8 #include "grit/theme_resources.h"
9 #include "grit/ui_resources.h" 9 #include "grit/ui_resources.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 WebsiteSettingsUI::PermissionInfo::PermissionInfo() 76 WebsiteSettingsUI::PermissionInfo::PermissionInfo()
77 : type(CONTENT_SETTINGS_TYPE_DEFAULT), 77 : type(CONTENT_SETTINGS_TYPE_DEFAULT),
78 setting(CONTENT_SETTING_DEFAULT), 78 setting(CONTENT_SETTING_DEFAULT),
79 default_setting(CONTENT_SETTING_DEFAULT), 79 default_setting(CONTENT_SETTING_DEFAULT),
80 source(content_settings::SETTING_SOURCE_NONE) { 80 source(content_settings::SETTING_SOURCE_NONE) {
81 } 81 }
82 82
83 WebsiteSettingsUI::IdentityInfo::IdentityInfo() 83 WebsiteSettingsUI::IdentityInfo::IdentityInfo()
84 : identity_status(WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN), 84 : identity_status(WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN),
85 cert_id(0), 85 cert_id(0),
86 connection_status(WebsiteSettings::SITE_CONNECTION_STATUS_UNKNOWN), 86 connection_status(WebsiteSettings::SITE_CONNECTION_STATUS_UNKNOWN) {
87 show_ssl_decision_revoke_button(false) {
88 } 87 }
89 88
90 WebsiteSettingsUI::IdentityInfo::~IdentityInfo() {} 89 WebsiteSettingsUI::IdentityInfo::~IdentityInfo() {}
91 90
92 base::string16 WebsiteSettingsUI::IdentityInfo::GetIdentityStatusText() const { 91 base::string16 WebsiteSettingsUI::IdentityInfo::GetIdentityStatusText() const {
93 if (identity_status == WebsiteSettings::SITE_IDENTITY_STATUS_CERT || 92 if (identity_status == WebsiteSettings::SITE_IDENTITY_STATUS_CERT ||
94 identity_status == WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT) { 93 identity_status == WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT) {
95 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_IDENTITY_VERIFIED); 94 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_IDENTITY_VERIFIED);
96 } 95 }
97 if (identity_status == 96 if (identity_status ==
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 // the first time. 326 // the first time.
328 return IDR_PAGEINFO_INFO; 327 return IDR_PAGEINFO_INFO;
329 } 328 }
330 329
331 // static 330 // static
332 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon( 331 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
333 const base::string16& first_visit) { 332 const base::string16& first_visit) {
334 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 333 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
335 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit)); 334 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
336 } 335 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings_ui.h ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698