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

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

Issue 588583002: LocalSharedObjectsContainer: Separate object counting in an interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Just rebased Created 6 years, 2 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
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"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/i18n/time_formatting.h" 13 #include "base/i18n/time_formatting.h"
14 #include "base/metrics/field_trial.h" 14 #include "base/metrics/field_trial.h"
15 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
16 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h" 19 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
20 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" 20 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
21 #include "chrome/browser/browsing_data/browsing_data_database_helper.h" 21 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
22 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" 22 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
23 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" 23 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
24 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" 24 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
25 #include "chrome/browser/content_settings/content_settings_utils.h" 25 #include "chrome/browser/content_settings/content_settings_utils.h"
26 #include "chrome/browser/content_settings/host_content_settings_map.h" 26 #include "chrome/browser/content_settings/host_content_settings_map.h"
27 #include "chrome/browser/content_settings/local_shared_objects_container.h" 27 #include "chrome/browser/content_settings/local_shared_objects_counter.h"
28 #include "chrome/browser/history/history_service_factory.h" 28 #include "chrome/browser/history/history_service_factory.h"
29 #include "chrome/browser/profiles/profile.h" 29 #include "chrome/browser/profiles/profile.h"
30 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" 30 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
31 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h" 31 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
32 #include "chrome/browser/ssl/ssl_error_info.h" 32 #include "chrome/browser/ssl/ssl_error_info.h"
33 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h " 33 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h "
34 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 34 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
35 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
36 #include "chrome/grit/chromium_strings.h" 36 #include "chrome/grit/chromium_strings.h"
37 #include "chrome/grit/generated_resources.h" 37 #include "chrome/grit/generated_resources.h"
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 NULL); 687 NULL);
688 } 688 }
689 permission_info_list.push_back(permission_info); 689 permission_info_list.push_back(permission_info);
690 } 690 }
691 691
692 ui_->SetPermissionInfo(permission_info_list); 692 ui_->SetPermissionInfo(permission_info_list);
693 } 693 }
694 694
695 void WebsiteSettings::PresentSiteData() { 695 void WebsiteSettings::PresentSiteData() {
696 CookieInfoList cookie_info_list; 696 CookieInfoList cookie_info_list;
697 const LocalSharedObjectsContainer& allowed_objects = 697 const LocalSharedObjectsCounter& allowed_objects =
698 tab_specific_content_settings()->allowed_local_shared_objects(); 698 tab_specific_content_settings()->allowed_local_shared_objects();
699 const LocalSharedObjectsContainer& blocked_objects = 699 const LocalSharedObjectsCounter& blocked_objects =
700 tab_specific_content_settings()->blocked_local_shared_objects(); 700 tab_specific_content_settings()->blocked_local_shared_objects();
701 701
702 // Add first party cookie and site data counts. 702 // Add first party cookie and site data counts.
703 WebsiteSettingsUI::CookieInfo cookie_info; 703 WebsiteSettingsUI::CookieInfo cookie_info;
704 std::string cookie_source = 704 std::string cookie_source =
705 net::registry_controlled_domains::GetDomainAndRegistry( 705 net::registry_controlled_domains::GetDomainAndRegistry(
706 site_url_, 706 site_url_,
707 net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); 707 net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
708 if (cookie_source.empty()) 708 if (cookie_source.empty())
709 cookie_source = site_url_.host(); 709 cookie_source = site_url_.host();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 if (visited_before_today) { 762 if (visited_before_today) {
763 first_visit_text = l10n_util::GetStringFUTF16( 763 first_visit_text = l10n_util::GetStringFUTF16(
764 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, 764 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
765 base::TimeFormatShortDate(first_visit)); 765 base::TimeFormatShortDate(first_visit));
766 } else { 766 } else {
767 first_visit_text = l10n_util::GetStringUTF16( 767 first_visit_text = l10n_util::GetStringUTF16(
768 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); 768 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
769 } 769 }
770 ui_->SetFirstVisit(first_visit_text); 770 ui_->SetFirstVisit(first_visit_text);
771 } 771 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/collected_cookies_views.cc ('k') | chrome/browser/ui/webui/options/website_settings_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698