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

Unified Diff: chrome/common/content_settings_helper.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and address some style nits. Created 6 years, 8 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/common/content_settings_helper.cc
diff --git a/chrome/common/content_settings_helper.cc b/chrome/common/content_settings_helper.cc
index 9fa5607ccf48aa92275add992e47aebe79fdfabe..38840e1b9b56e0815b1947718c9d606f5c1abc3f 100644
--- a/chrome/common/content_settings_helper.cc
+++ b/chrome/common/content_settings_helper.cc
@@ -7,6 +7,7 @@
#include "base/strings/string_piece.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/url_constants.h"
+#include "net/base/url_constants.h"
#include "url/gurl.h"
namespace content_settings_helper {
@@ -15,9 +16,9 @@ std::string OriginToString(const GURL& origin) {
std::string port_component(origin.IntPort() != url_parse::PORT_UNSPECIFIED
? ":" + origin.port()
: std::string());
- std::string scheme_component(!origin.SchemeIs(content::kHttpScheme)
+ std::string scheme_component(!origin.SchemeIs(net::kHttpScheme)
? origin.scheme() +
- content::kStandardSchemeSeparator
+ content::kStandardSchemeSeparator
: std::string());
return scheme_component + origin.host() + port_component;
}

Powered by Google App Engine
This is Rietveld 408576698