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

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

Issue 588583002: LocalSharedObjectsContainer: Separate object counting in an interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Just rebased Created 6 years, 3 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/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 bd2a75025beaa2db7d4e29b775df0cdbac64dde9..52c0115bab73676b15f463ae12b23066fece6e3b 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
@@ -12,7 +12,6 @@
#include "base/strings/sys_string_conversions.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/content_settings/cookie_settings.h"
-#include "chrome/browser/content_settings/local_shared_objects_container.h"
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -358,13 +357,8 @@ void CollectedCookiesMac::OnConstrainedWindowClosed(
TabSpecificContentSettings* content_settings =
TabSpecificContentSettings::FromWebContents(webContents_);
- const LocalSharedObjectsContainer& allowed_data =
- content_settings->allowed_local_shared_objects();
- allowedTreeModel_ = allowed_data.CreateCookiesTreeModel();
-
- const LocalSharedObjectsContainer& blocked_data =
- content_settings->blocked_local_shared_objects();
- blockedTreeModel_ = blocked_data.CreateCookiesTreeModel();
+ allowedTreeModel_ = content_settings->CreateAllowedCookiesTreeModel();
+ blockedTreeModel_ = content_settings->CreateBlockedCookiesTreeModel();
// Convert the model's icons from Skia to Cocoa.
std::vector<gfx::ImageSkia> skiaIcons;
« no previous file with comments | « chrome/browser/content_settings/tab_specific_content_settings.h ('k') | chrome/browser/ui/views/collected_cookies_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698