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

Unified Diff: chrome/browser/ui/views/collected_cookies_views.cc

Issue 10790150: Show Flash LSOs for Pepper Flash in cookie dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
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..ebec4bad8dd1df4dc03f20541f634e7e2bf09f41 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -343,20 +343,7 @@ views::View* CollectedCookiesViews::CreateAllowedPane() {
const LocalSharedObjectsContainer& allowed_lsos =
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_lsos.CreateCookiesTreeModel();
allowed_cookies_tree_ = new views::TreeView();
allowed_cookies_tree_->SetModel(allowed_cookies_tree_model_.get());
allowed_cookies_tree_->SetRootShown(false);
@@ -414,21 +401,7 @@ views::View* CollectedCookiesViews::CreateBlockedPane() {
blocked_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
const LocalSharedObjectsContainer& blocked_lsos =
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_lsos.CreateCookiesTreeModel();
blocked_cookies_tree_ = new views::TreeView();
blocked_cookies_tree_->SetModel(blocked_cookies_tree_model_.get());
blocked_cookies_tree_->SetRootShown(false);

Powered by Google App Engine
This is Rietveld 408576698