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 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
521 void WebsiteSettings::PresentSiteData() { | 521 void WebsiteSettings::PresentSiteData() { |
522 CookieInfoList cookie_info_list; | 522 CookieInfoList cookie_info_list; |
523 const LocalSharedObjectsContainer& allowed_objects = | 523 const LocalSharedObjectsContainer& allowed_objects = |
524 tab_specific_content_settings()->allowed_local_shared_objects(); | 524 tab_specific_content_settings()->allowed_local_shared_objects(); |
525 const LocalSharedObjectsContainer& blocked_objects = | 525 const LocalSharedObjectsContainer& blocked_objects = |
526 tab_specific_content_settings()->blocked_local_shared_objects(); | 526 tab_specific_content_settings()->blocked_local_shared_objects(); |
527 | 527 |
528 // Add first party cookie and site data counts. | 528 // Add first party cookie and site data counts. |
529 WebsiteSettingsUI::CookieInfo cookie_info; | 529 WebsiteSettingsUI::CookieInfo cookie_info; |
530 std::string cookie_source = | 530 std::string cookie_source = |
531 net::RegistryControlledDomainService::GetDomainAndRegistry(site_url_); | 531 net::registry_controlled_domains::GetDomainAndRegistry( |
| 532 site_url_, |
| 533 net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES); |
532 if (cookie_source.empty()) | 534 if (cookie_source.empty()) |
533 cookie_source = site_url_.host(); | 535 cookie_source = site_url_.host(); |
534 cookie_info.cookie_source = cookie_source; | 536 cookie_info.cookie_source = cookie_source; |
535 cookie_info.allowed = allowed_objects.GetObjectCountForDomain(site_url_); | 537 cookie_info.allowed = allowed_objects.GetObjectCountForDomain(site_url_); |
536 cookie_info.blocked = blocked_objects.GetObjectCountForDomain(site_url_); | 538 cookie_info.blocked = blocked_objects.GetObjectCountForDomain(site_url_); |
537 cookie_info_list.push_back(cookie_info); | 539 cookie_info_list.push_back(cookie_info); |
538 | 540 |
539 // Add third party cookie counts. | 541 // Add third party cookie counts. |
540 cookie_info.cookie_source = l10n_util::GetStringUTF8( | 542 cookie_info.cookie_source = l10n_util::GetStringUTF8( |
541 IDS_WEBSITE_SETTINGS_THIRD_PARTY_SITE_DATA); | 543 IDS_WEBSITE_SETTINGS_THIRD_PARTY_SITE_DATA); |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
583 first_visit_text = l10n_util::GetStringFUTF16( | 585 first_visit_text = l10n_util::GetStringFUTF16( |
584 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, | 586 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, |
585 base::TimeFormatShortDate(first_visit)); | 587 base::TimeFormatShortDate(first_visit)); |
586 } else { | 588 } else { |
587 first_visit_text = l10n_util::GetStringUTF16( | 589 first_visit_text = l10n_util::GetStringUTF16( |
588 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); | 590 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); |
589 | 591 |
590 } | 592 } |
591 ui_->SetFirstVisit(first_visit_text); | 593 ui_->SetFirstVisit(first_visit_text); |
592 } | 594 } |
OLD | NEW |