net/base/registry_controlled_domains/registry_controlled_domain.h - Issue 649763002: git cl format the second third of the net/base directory

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: net/base/registry_controlled_domains/registry_controlled_domain.h

Issue 649763002: git cl format the second third of the net/base directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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

« net/base/network_change_notifier.cc ('K') | « net/base/proxy_delegate.h ('k') | net/base/registry_controlled_domains/registry_controlled_domain.cc » ('j') | net/base/trace_net_log_observer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/base/registry_controlled_domains/registry_controlled_domain.h

diff --git a/net/base/registry_controlled_domains/registry_controlled_domain.h b/net/base/registry_controlled_domains/registry_controlled_domain.h

index 639f264047b0255617577fef7f6d6929027bc286..03171a39952c62a1a9959c8c846210136e1a36b7 100644

--- a/net/base/registry_controlled_domains/registry_controlled_domain.h

+++ b/net/base/registry_controlled_domains/registry_controlled_domain.h

@@ -188,7 +188,8 @@ NET_EXPORT std::string GetDomainAndRegistry(const std::string& host,

// * They don't have known domains/registries, but the hosts are identical.

// Effectively, callers can use this function to check whether the input URLs

// represent hosts "on the same site".

-NET_EXPORT bool SameDomainOrHost(const GURL& gurl1, const GURL& gurl2,

+NET_EXPORT bool SameDomainOrHost(const GURL& gurl1,

+ const GURL& gurl2,

PrivateRegistryFilter filter);

// Finds the length in bytes of the registrar portion of the host in the

@@ -224,7 +225,7 @@ NET_EXPORT size_t GetRegistryLength(const std::string& host,

UnknownRegistryFilter unknown_filter,

PrivateRegistryFilter private_filter);

-typedef const struct DomainRule* (*FindDomainPtr)(const char *, unsigned int);

+typedef const struct DomainRule* (*FindDomainPtr)(const char*, unsigned int);

// Used for unit tests. Use default domains.

NET_EXPORT_PRIVATE void SetFindDomainGraph();