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

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

Issue 13979002: Add support for split PSL list distinctions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed chrome_frame compilation issue Created 7 years, 7 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.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 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 void WebsiteSettings::PresentSiteData() { 512 void WebsiteSettings::PresentSiteData() {
513 CookieInfoList cookie_info_list; 513 CookieInfoList cookie_info_list;
514 const LocalSharedObjectsContainer& allowed_objects = 514 const LocalSharedObjectsContainer& allowed_objects =
515 tab_specific_content_settings()->allowed_local_shared_objects(); 515 tab_specific_content_settings()->allowed_local_shared_objects();
516 const LocalSharedObjectsContainer& blocked_objects = 516 const LocalSharedObjectsContainer& blocked_objects =
517 tab_specific_content_settings()->blocked_local_shared_objects(); 517 tab_specific_content_settings()->blocked_local_shared_objects();
518 518
519 // Add first party cookie and site data counts. 519 // Add first party cookie and site data counts.
520 WebsiteSettingsUI::CookieInfo cookie_info; 520 WebsiteSettingsUI::CookieInfo cookie_info;
521 std::string cookie_source = 521 std::string cookie_source =
522 net::RegistryControlledDomainService::GetDomainAndRegistry(site_url_); 522 net::RegistryControlledDomainService::GetDomainAndRegistry(site_url_,
523 net::RCDS::EXCLUDE_PRIVATE_REGISTRIES);
523 if (cookie_source.empty()) 524 if (cookie_source.empty())
524 cookie_source = site_url_.host(); 525 cookie_source = site_url_.host();
525 cookie_info.cookie_source = cookie_source; 526 cookie_info.cookie_source = cookie_source;
526 cookie_info.allowed = allowed_objects.GetObjectCountForDomain(site_url_); 527 cookie_info.allowed = allowed_objects.GetObjectCountForDomain(site_url_);
527 cookie_info.blocked = blocked_objects.GetObjectCountForDomain(site_url_); 528 cookie_info.blocked = blocked_objects.GetObjectCountForDomain(site_url_);
528 cookie_info_list.push_back(cookie_info); 529 cookie_info_list.push_back(cookie_info);
529 530
530 // Add third party cookie counts. 531 // Add third party cookie counts.
531 cookie_info.cookie_source = l10n_util::GetStringUTF8( 532 cookie_info.cookie_source = l10n_util::GetStringUTF8(
532 IDS_WEBSITE_SETTINGS_THIRD_PARTY_SITE_DATA); 533 IDS_WEBSITE_SETTINGS_THIRD_PARTY_SITE_DATA);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 first_visit_text = l10n_util::GetStringFUTF16( 575 first_visit_text = l10n_util::GetStringFUTF16(
575 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, 576 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
576 base::TimeFormatShortDate(first_visit)); 577 base::TimeFormatShortDate(first_visit));
577 } else { 578 } else {
578 first_visit_text = l10n_util::GetStringUTF16( 579 first_visit_text = l10n_util::GetStringUTF16(
579 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); 580 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
580 581
581 } 582 }
582 ui_->SetFirstVisit(first_visit_text); 583 ui_->SetFirstVisit(first_visit_text);
583 } 584 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698