Index: chrome/browser/ui/views/collected_cookies_views.cc |
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc |
index efc3fd1e678e54430ab1daea6ea7b072e80014f1..a7c4480a3cd29024c8643eb62049506c4e0ee2c5 100644 |
--- a/chrome/browser/ui/views/collected_cookies_views.cc |
+++ b/chrome/browser/ui/views/collected_cookies_views.cc |
@@ -341,22 +341,9 @@ views::View* CollectedCookiesViews::CreateAllowedPane() { |
allowed_label_ = new views::Label(l10n_util::GetStringUTF16( |
IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL)); |
- const LocalSharedObjectsContainer& allowed_lsos = |
+ const LocalSharedObjectsContainer& allowed_data = |
content_settings->allowed_local_shared_objects(); |
- ContainerMap apps_map; |
- apps_map[std::string()] = new LocalDataContainer( |
- std::string(), std::string(), |
- allowed_lsos.cookies()->Clone(), |
- allowed_lsos.databases()->Clone(), |
- allowed_lsos.local_storages()->Clone(), |
- allowed_lsos.session_storages()->Clone(), |
- allowed_lsos.appcaches()->Clone(), |
- allowed_lsos.indexed_dbs()->Clone(), |
- allowed_lsos.file_systems()->Clone(), |
- NULL, |
- allowed_lsos.server_bound_certs()->Clone()); |
- |
- allowed_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, NULL, true)); |
+ allowed_cookies_tree_model_ = allowed_data.CreateCookiesTreeModel(); |
allowed_cookies_tree_ = new views::TreeView(); |
allowed_cookies_tree_->SetModel(allowed_cookies_tree_model_.get()); |
allowed_cookies_tree_->SetRootShown(false); |
@@ -412,23 +399,9 @@ views::View* CollectedCookiesViews::CreateBlockedPane() { |
IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL)); |
blocked_label_->SetMultiLine(true); |
blocked_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
- const LocalSharedObjectsContainer& blocked_lsos = |
+ const LocalSharedObjectsContainer& blocked_data = |
content_settings->blocked_local_shared_objects(); |
- string16 name = ASCIIToUTF16("Site Data"); |
- ContainerMap apps_map; |
- apps_map[std::string()] = new LocalDataContainer( |
- std::string(), std::string(), |
- blocked_lsos.cookies()->Clone(), |
- blocked_lsos.databases()->Clone(), |
- blocked_lsos.local_storages()->Clone(), |
- blocked_lsos.session_storages()->Clone(), |
- blocked_lsos.appcaches()->Clone(), |
- blocked_lsos.indexed_dbs()->Clone(), |
- blocked_lsos.file_systems()->Clone(), |
- NULL, |
- blocked_lsos.server_bound_certs()->Clone()); |
- |
- blocked_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, NULL, true)); |
+ blocked_cookies_tree_model_ = blocked_data.CreateCookiesTreeModel(); |
blocked_cookies_tree_ = new views::TreeView(); |
blocked_cookies_tree_->SetModel(blocked_cookies_tree_model_.get()); |
blocked_cookies_tree_->SetRootShown(false); |