Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3461)

Unified Diff: chrome/utility/importer/ie_importer_win.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/utility/importer/ie_importer_win.cc
diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importer/ie_importer_win.cc
index 540cf59ac981f5dfb36ae19840f80d9474dadbfa..1ba2d6b45180bb52042046506648cf3acdbf653c 100644
--- a/chrome/utility/importer/ie_importer_win.cc
+++ b/chrome/utility/importer/ie_importer_win.cc
@@ -468,8 +468,8 @@ void IEImporter::ImportFavorites() {
}
void IEImporter::ImportHistory() {
- const std::string kSchemes[] = {content::kHttpScheme,
- content::kHttpsScheme,
+ const std::string kSchemes[] = {url::kHttpScheme,
+ url::kHttpsScheme,
content::kFtpScheme,
content::kFileScheme};
int total_schemes = arraysize(kSchemes);
@@ -602,8 +602,8 @@ void IEImporter::ImportPasswordsIE6() {
continue;
GURL url(ac_list[i].key.c_str());
- if (!(LowerCaseEqualsASCII(url.scheme(), content::kHttpScheme) ||
- LowerCaseEqualsASCII(url.scheme(), content::kHttpsScheme))) {
+ if (!(LowerCaseEqualsASCII(url.scheme(), url::kHttpScheme) ||
+ LowerCaseEqualsASCII(url.scheme(), url::kHttpsScheme))) {
continue;
}
« no previous file with comments | « chrome/renderer/safe_browsing/phishing_classifier.cc ('k') | components/autofill/content/renderer/autofill_agent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698