chrome/browser/supervised_user/supervised_user_url_filter.cc - Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4.

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/supervised_user/supervised_user_url_filter.cc

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 5 years 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/supervised_user/supervised_user_url_filter.h ('k') | chrome/browser/supervised_user/supervised_user_whitelist_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_url_filter.cc

diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chrome/browser/supervised_user/supervised_user_url_filter.cc

index e9a1a68bd25cbd2f6106973f23595ca8e9c6ff98..9956e3dd4cca18d5d0dfe4b386133f7be2a3a376 100644

--- a/chrome/browser/supervised_user/supervised_user_url_filter.cc

+++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc

@@ -4,12 +4,16 @@

#include "chrome/browser/supervised_user/supervised_user_url_filter.h"

+#include <stddef.h>

+#include <stdint.h>

#include <set>

#include <utility>

#include "base/containers/hash_tables.h"

#include "base/files/file_path.h"

#include "base/json/json_file_value_serializer.h"

+#include "base/macros.h"

#include "base/sha1.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/string_util.h"

@@ -102,7 +106,7 @@ FilterBuilder::~FilterBuilder() {

bool FilterBuilder::AddPattern(const std::string& pattern) {

std::string scheme;

std::string host;

- uint16 port = 0;

+ uint16_t port = 0;

std::string path;

std::string query;

bool match_subdomains = true;