OLD | NEW |
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 Loading... |
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 certificate_decision_made(false) { |
87 } | 88 } |
88 | 89 |
89 WebsiteSettingsUI::IdentityInfo::~IdentityInfo() {} | 90 WebsiteSettingsUI::IdentityInfo::~IdentityInfo() {} |
90 | 91 |
91 base::string16 WebsiteSettingsUI::IdentityInfo::GetIdentityStatusText() const { | 92 base::string16 WebsiteSettingsUI::IdentityInfo::GetIdentityStatusText() const { |
92 if (identity_status == WebsiteSettings::SITE_IDENTITY_STATUS_CERT || | 93 if (identity_status == WebsiteSettings::SITE_IDENTITY_STATUS_CERT || |
93 identity_status == WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT) { | 94 identity_status == WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT) { |
94 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_IDENTITY_VERIFIED); | 95 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_IDENTITY_VERIFIED); |
95 } | 96 } |
96 if (identity_status == | 97 if (identity_status == |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
326 // the first time. | 327 // the first time. |
327 return IDR_PAGEINFO_INFO; | 328 return IDR_PAGEINFO_INFO; |
328 } | 329 } |
329 | 330 |
330 // static | 331 // static |
331 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon( | 332 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon( |
332 const base::string16& first_visit) { | 333 const base::string16& first_visit) { |
333 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 334 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
334 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit)); | 335 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit)); |
335 } | 336 } |
OLD | NEW |