| 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 3df5a8320b84eaf75305ce5ae1501219fed712c1..c046f0a7c0573b1260da2365cda49a42f471377f 100644
|
| --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
|
| @@ -384,43 +384,13 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {
|
| TabSpecificContentSettings* content_settings =
|
| tab_contents_->content_settings();
|
|
|
| - 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());
|
| -
|
| - allowedTreeModel_.reset(new CookiesTreeModel(apps_map, NULL, true));
|
| - }
|
| + allowedTreeModel_ = allowed_data.CreateCookiesTreeModel();
|
|
|
| - const LocalSharedObjectsContainer& blocked_lsos =
|
| + const LocalSharedObjectsContainer& blocked_data =
|
| content_settings->blocked_local_shared_objects();
|
| - {
|
| - 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, NULL, true));
|
| - }
|
| + blockedTreeModel_ = blocked_data.CreateCookiesTreeModel();
|
|
|
| // Convert the model's icons from Skia to Cocoa.
|
| std::vector<gfx::ImageSkia> skiaIcons;
|
|
|