chrome/browser/content_settings/local_shared_objects_container.cc - Issue 2110483002: Remove use of CanonicalCookie::Source() from browsing_data.

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/content_settings/local_shared_objects_container.cc

Issue 2110483002: Remove use of CanonicalCookie::Source() from browsing_data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix merge Created 4 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/browsing_data/cookies_tree_model_unittest.cc ('k') | chrome/browser/ui/webui/options/cookies_view_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/local_shared_objects_container.cc

diff --git a/chrome/browser/content_settings/local_shared_objects_container.cc b/chrome/browser/content_settings/local_shared_objects_container.cc

index 7327d2a3c03c47a4151ab7ee396460640f9943bb..d82aa46da420c2fbe7befc543535229f0ab0a17e 100644

--- a/chrome/browser/content_settings/local_shared_objects_container.cc

+++ b/chrome/browser/content_settings/local_shared_objects_container.cc

@@ -221,8 +221,8 @@ std::unique_ptr<CookiesTreeModel>

LocalSharedObjectsContainer::CreateCookiesTreeModel() const {

LocalDataContainer* container = new LocalDataContainer(

cookies(), databases(), local_storages(), session_storages(), appcaches(),

- indexed_dbs(), file_systems(), NULL, channel_ids(), service_workers(),

- cache_storages(), NULL);

+ indexed_dbs(), file_systems(), nullptr, channel_ids(), service_workers(),

+ cache_storages(), nullptr);

- return base::WrapUnique(new CookiesTreeModel(container, NULL, true));

+ return base::WrapUnique(new CookiesTreeModel(container, nullptr));

}