chrome/browser/content_settings/local_shared_objects_container.cc - Issue 254763005: Move some content url constants to /url.

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 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolve a merge conflict. Created 6 years, 7 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:

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 4cc1fa1afb7b5dd975e8cee464c6e572b4b705ea..fa48f6f51cf5a2d9f970d94fda0e5c747d79ac54 100644

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

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

@@ -99,7 +99,7 @@ size_t LocalSharedObjectsContainer::GetObjectCountForDomain(

// The |domain_url| is only created in order to use the

// SameDomainOrHost method below. It does not matter which scheme is

// used as the scheme is ignored by the SameDomainOrHost method.

- GURL domain_url(std::string(content::kHttpScheme) +

+ GURL domain_url(std::string(url::kHttpScheme) +

content::kStandardSchemeSeparator + cookie_domain);

if (SameDomainOrHost(origin, domain_url))

++count;