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

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

Issue 120593003: Move kFileScheme constant into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
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 a6c737206b900f92a1cce700ce8f6efcb2d85f0e..51fe80d21f1044f5c709b8efc491db67aac535bc 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(chrome::kFileScheme) +
+ return std::string(content::kFileScheme) +
content::kStandardSchemeSeparator;
}
@@ -555,7 +555,7 @@ CookieTreeNode::DetailedInfo CookieTreeRootNode::GetDetailedInfo() const {
// static
base::string16 CookieTreeHostNode::TitleForUrl(const GURL& url) {
const std::string file_origin_node_name(
- std::string(chrome::kFileScheme) + content::kStandardSchemeSeparator);
+ std::string(content::kFileScheme) + content::kStandardSchemeSeparator);
return base::UTF8ToUTF16(url.SchemeIsFile() ? file_origin_node_name
: url.host());
}
@@ -579,7 +579,7 @@ CookieTreeHostNode::~CookieTreeHostNode() {}
const std::string CookieTreeHostNode::GetHost() const {
const std::string file_origin_node_name(
- std::string(chrome::kFileScheme) + content::kStandardSchemeSeparator);
+ std::string(content::kFileScheme) + content::kStandardSchemeSeparator);
return url_.SchemeIsFile() ? file_origin_node_name : url_.host();
}

Powered by Google App Engine
This is Rietveld 408576698