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 7b6d39055360697b1bc26fc042702528d5456b1d..9873334bc38be8d371aa20e613d8bc6f388b10c0 100644 |
--- a/chrome/browser/ui/views/collected_cookies_views.cc |
+++ b/chrome/browser/ui/views/collected_cookies_views.cc |
@@ -332,17 +332,20 @@ views::View* CollectedCookiesViews::CreateAllowedPane() { |
const LocalSharedObjectsContainer& allowed_lsos = |
content_settings->allowed_local_shared_objects(); |
- allowed_cookies_tree_model_.reset( |
- new CookiesTreeModel(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(), |
- true)); |
+ 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, true)); |
allowed_cookies_tree_ = new views::TreeView(); |
allowed_cookies_tree_->SetModel(allowed_cookies_tree_model_.get()); |
allowed_cookies_tree_->SetRootShown(false); |
@@ -400,17 +403,21 @@ views::View* CollectedCookiesViews::CreateBlockedPane() { |
blocked_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
const LocalSharedObjectsContainer& blocked_lsos = |
content_settings->blocked_local_shared_objects(); |
- blocked_cookies_tree_model_.reset( |
- new CookiesTreeModel(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(), |
- true)); |
+ 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, true)); |
blocked_cookies_tree_ = new views::TreeView(); |
blocked_cookies_tree_->SetModel(blocked_cookies_tree_model_.get()); |
blocked_cookies_tree_->SetRootShown(false); |