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

Unified Diff: chrome/browser/browsing_data/cookies_tree_model.cc

Issue 273193004: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/browser/browsing_data/cookies_tree_model.cc
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 0fb14e550f9c906292a51e2d87bc0fa4da1e8dcb..b6bb5718a74ef958cbf269b9ee2e82e298b1ebe0 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -72,7 +72,7 @@ std::string CanonicalizeHost(const GURL& url) {
// "google.com".
if (url.SchemeIsFile()) {
- return std::string(content::kFileScheme) +
+ return std::string(url::kFileScheme) +
content::kStandardSchemeSeparator;
}
@@ -559,7 +559,7 @@ CookieTreeNode::DetailedInfo CookieTreeRootNode::GetDetailedInfo() const {
// static
base::string16 CookieTreeHostNode::TitleForUrl(const GURL& url) {
const std::string file_origin_node_name(
- std::string(content::kFileScheme) + content::kStandardSchemeSeparator);
+ std::string(url::kFileScheme) + content::kStandardSchemeSeparator);
return base::UTF8ToUTF16(url.SchemeIsFile() ? file_origin_node_name
: url.host());
}
@@ -583,7 +583,7 @@ CookieTreeHostNode::~CookieTreeHostNode() {}
const std::string CookieTreeHostNode::GetHost() const {
const std::string file_origin_node_name(
- std::string(content::kFileScheme) + content::kStandardSchemeSeparator);
+ std::string(url::kFileScheme) + content::kStandardSchemeSeparator);
return url_.SchemeIsFile() ? file_origin_node_name : url_.host();
}

Powered by Google App Engine
This is Rietveld 408576698