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

Unified Diff: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

Issue 10636019: Adding Application Data dialog for isolated apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed merge conflicts 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
« no previous file with comments | « chrome/browser/resources/options2/options_bundle.js ('k') | chrome/browser/ui/gtk/collected_cookies_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
index ade45b5adbbdd1efe4d7b727525cf2410d40b563..260507e1df814d1bd5a233de180ebc6aaa33d6a4 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
@@ -386,30 +386,41 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {
const LocalSharedObjectsContainer& allowed_lsos =
content_settings->allowed_local_shared_objects();
- allowedTreeModel_.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());
+
+ allowedTreeModel_.reset(new CookiesTreeModel(apps_map, true));
+ }
+
const LocalSharedObjectsContainer& blocked_lsos =
content_settings->blocked_local_shared_objects();
- blockedTreeModel_.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));
+ {
+ 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());
+
+ blockedTreeModel_.reset(new CookiesTreeModel(apps_map, true));
+ }
// Convert the model's icons from Skia to Cocoa.
std::vector<gfx::ImageSkia> skiaIcons;
« no previous file with comments | « chrome/browser/resources/options2/options_bundle.js ('k') | chrome/browser/ui/gtk/collected_cookies_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698