| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "components/toolbar/toolbar_model_impl.h" | 5 #include "components/toolbar/toolbar_model_impl.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 | 135 |
| 136 // EV are required to have an organization name and country. | 136 // EV are required to have an organization name and country. |
| 137 DCHECK(!cert->subject().organization_names.empty()); | 137 DCHECK(!cert->subject().organization_names.empty()); |
| 138 DCHECK(!cert->subject().country_name.empty()); | 138 DCHECK(!cert->subject().country_name.empty()); |
| 139 return l10n_util::GetStringFUTF16( | 139 return l10n_util::GetStringFUTF16( |
| 140 IDS_SECURE_CONNECTION_EV, | 140 IDS_SECURE_CONNECTION_EV, |
| 141 base::UTF8ToUTF16(cert->subject().organization_names[0]), | 141 base::UTF8ToUTF16(cert->subject().organization_names[0]), |
| 142 base::UTF8ToUTF16(cert->subject().country_name)); | 142 base::UTF8ToUTF16(cert->subject().country_name)); |
| 143 } | 143 } |
| 144 | 144 |
| 145 base::string16 ToolbarModelImpl::GetVerboseStateText() const { |
| 146 switch (GetSecurityLevel(false)) { |
| 147 case SecurityStateModel::SECURE: |
| 148 return l10n_util::GetStringUTF16(IDS_SECURE_VERBOSE_STATE); |
| 149 case SecurityStateModel::SECURITY_ERROR: |
| 150 return l10n_util::GetStringUTF16(IDS_NOT_SECURE_VERBOSE_STATE); |
| 151 default: |
| 152 return base::string16(); |
| 153 } |
| 154 } |
| 155 |
| 145 bool ToolbarModelImpl::ShouldDisplayURL() const { | 156 bool ToolbarModelImpl::ShouldDisplayURL() const { |
| 146 return delegate_->ShouldDisplayURL(); | 157 return delegate_->ShouldDisplayURL(); |
| 147 } | 158 } |
| 148 | 159 |
| 149 base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const { | 160 base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const { |
| 150 if (!url_replacement_enabled() || (input_in_progress() && !ignore_editing)) | 161 if (!url_replacement_enabled() || (input_in_progress() && !ignore_editing)) |
| 151 return base::string16(); | 162 return base::string16(); |
| 152 | 163 |
| 153 return delegate_->GetSearchTerms(GetSecurityLevel(ignore_editing)); | 164 return delegate_->GetSearchTerms(GetSecurityLevel(ignore_editing)); |
| 154 } | 165 } |
| OLD | NEW |