chrome/browser/ui/views/collected_cookies_views.cc - Issue 588583002: LocalSharedObjectsContainer: Separate object counting in an interface

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

« no previous file with comments | « chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm ('k') | chrome/browser/ui/website_settings/website_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 4487710c489a480443d33028fc226590622a33ca..302becd54908ee46083adfe36d3e901b9311906b 100644

--- a/chrome/browser/ui/views/collected_cookies_views.cc

+++ b/chrome/browser/ui/views/collected_cookies_views.cc

@@ -15,7 +15,6 @@

#include "chrome/browser/browsing_data/cookies_tree_model.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"

@@ -332,9 +331,8 @@ views::View* CollectedCookiesViews::CreateAllowedPane() {

allowed_label_ = new views::Label(l10n_util::GetStringUTF16(

IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL));

- const LocalSharedObjectsContainer& allowed_data =

- content_settings->allowed_local_shared_objects();

- allowed_cookies_tree_model_ = allowed_data.CreateCookiesTreeModel();

+ allowed_cookies_tree_model_ =

+ content_settings->CreateAllowedCookiesTreeModel();

allowed_cookies_tree_ = new views::TreeView();

allowed_cookies_tree_->SetModel(allowed_cookies_tree_model_.get());

allowed_cookies_tree_->SetRootShown(false);

@@ -406,9 +404,8 @@ views::View* CollectedCookiesViews::CreateBlockedPane() {

IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL));

blocked_label_->SetMultiLine(true);

blocked_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);

- const LocalSharedObjectsContainer& blocked_data =

- content_settings->blocked_local_shared_objects();

- blocked_cookies_tree_model_ = blocked_data.CreateCookiesTreeModel();

+ blocked_cookies_tree_model_ =

+ content_settings->CreateBlockedCookiesTreeModel();

blocked_cookies_tree_ = new views::TreeView();

blocked_cookies_tree_->SetModel(blocked_cookies_tree_model_.get());

blocked_cookies_tree_->SetRootShown(false);