| 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.h" | 5 #include "chrome/browser/ui/website_settings/website_settings.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 void WebsiteSettings::OnRevokeSSLErrorBypassButtonPressed() { | 330 void WebsiteSettings::OnRevokeSSLErrorBypassButtonPressed() { |
| 331 DCHECK(chrome_ssl_host_state_delegate_); | 331 DCHECK(chrome_ssl_host_state_delegate_); |
| 332 chrome_ssl_host_state_delegate_->RevokeUserAllowExceptionsHard( | 332 chrome_ssl_host_state_delegate_->RevokeUserAllowExceptionsHard( |
| 333 site_url().host()); | 333 site_url().host()); |
| 334 did_revoke_user_ssl_decisions_ = true; | 334 did_revoke_user_ssl_decisions_ = true; |
| 335 } | 335 } |
| 336 | 336 |
| 337 void WebsiteSettings::Init(Profile* profile, | 337 void WebsiteSettings::Init(Profile* profile, |
| 338 const GURL& url, | 338 const GURL& url, |
| 339 const content::SSLStatus& ssl) { | 339 const content::SSLStatus& ssl) { |
| 340 if (url.SchemeIs(content::kChromeUIScheme)) { | 340 bool isChromeUINativeScheme = false; |
| 341 #if defined(OS_ANDROID) |
| 342 isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme); |
| 343 #endif |
| 344 |
| 345 if (url.SchemeIs(content::kChromeUIScheme) || |
| 346 url.SchemeIs(url::kAboutScheme) || isChromeUINativeScheme) { |
| 341 site_identity_status_ = SITE_IDENTITY_STATUS_INTERNAL_PAGE; | 347 site_identity_status_ = SITE_IDENTITY_STATUS_INTERNAL_PAGE; |
| 342 site_identity_details_ = | 348 site_identity_details_ = |
| 343 l10n_util::GetStringUTF16(IDS_PAGE_INFO_INTERNAL_PAGE); | 349 l10n_util::GetStringUTF16(IDS_PAGE_INFO_INTERNAL_PAGE); |
| 344 site_connection_status_ = SITE_CONNECTION_STATUS_INTERNAL_PAGE; | 350 site_connection_status_ = SITE_CONNECTION_STATUS_INTERNAL_PAGE; |
| 345 return; | 351 return; |
| 346 } | 352 } |
| 347 | 353 |
| 348 scoped_refptr<net::X509Certificate> cert; | 354 scoped_refptr<net::X509Certificate> cert; |
| 349 | 355 |
| 350 // Identity section. | 356 // Identity section. |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 765 if (visited_before_today) { | 771 if (visited_before_today) { |
| 766 first_visit_text = l10n_util::GetStringFUTF16( | 772 first_visit_text = l10n_util::GetStringFUTF16( |
| 767 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, | 773 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, |
| 768 base::TimeFormatShortDate(first_visit)); | 774 base::TimeFormatShortDate(first_visit)); |
| 769 } else { | 775 } else { |
| 770 first_visit_text = l10n_util::GetStringUTF16( | 776 first_visit_text = l10n_util::GetStringUTF16( |
| 771 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); | 777 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); |
| 772 } | 778 } |
| 773 ui_->SetFirstVisit(first_visit_text); | 779 ui_->SetFirstVisit(first_visit_text); |
| 774 } | 780 } |
| OLD | NEW |