components/content_settings/core/common/content_settings_pattern.cc - Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component.

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: components/content_settings/core/common/content_settings_pattern.cc

Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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 | « components/content_settings/core/common/content_settings_pattern.h ('k') | components/content_settings/core/common/content_settings_pattern_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/common/content_settings_pattern.cc

diff --git a/chrome/common/content_settings_pattern.cc b/components/content_settings/core/common/content_settings_pattern.cc

similarity index 98%

rename from chrome/common/content_settings_pattern.cc

rename to components/content_settings/core/common/content_settings_pattern.cc

index 98ee8e13e99134fb7edf1aef174e89225ab5c7e3..b928ebd2bedf2019b66b6497d4e2ea2438f1c168 100644

--- a/chrome/common/content_settings_pattern.cc

+++ b/components/content_settings/core/common/content_settings_pattern.cc

@@ -2,14 +2,14 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/common/content_settings_pattern.h"

+#include "components/content_settings/core/common/content_settings_pattern.h"

#include <vector>

#include "base/memory/scoped_ptr.h"

#include "base/strings/string_split.h"

#include "base/strings/string_util.h"

-#include "chrome/common/content_settings_pattern_parser.h"

+#include "components/content_settings/core/common/content_settings_pattern_parser.h"

#include "net/base/dns_util.h"

#include "net/base/net_util.h"

#include "url/gurl.h"

@@ -53,8 +53,8 @@ int CompareDomainNames(const std::string& str1, const std::string& str2) {

base::SplitString(str1, '.', &domain_name1);

base::SplitString(str2, '.', &domain_name2);

- int i1 = domain_name1.size() - 1;

- int i2 = domain_name2.size() - 1;

+ int i1 = static_cast<int>(domain_name1.size()) - 1;

+ int i2 = static_cast<int>(domain_name2.size()) - 1;

int rv;

while (i1 >= 0 && i2 >= 0) {

// domain names are stored in puny code. So it's fine to use the compare