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

Unified Diff: net/base/net_util.cc

Issue 193072: Move StringPiece into the base namespace. It is colliding (Closed)
Patch Set: take 2 Created 11 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 | « net/base/net_module.cc ('k') | net/base/registry_controlled_domain.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_util.cc
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 13e99a533e30b4982a0c902bc434d8ff780b21f7..5f6b548ca2ebbe7faedc87e9128800b51afeb3dd 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -918,7 +918,8 @@ std::string CanonicalizeHost(const std::wstring& host,
}
std::string GetDirectoryListingHeader(const string16& title) {
- static const StringPiece header(NetModule::GetResource(IDR_DIR_HEADER_HTML));
+ static const base::StringPiece header(
+ NetModule::GetResource(IDR_DIR_HEADER_HTML));
// This can be null in unit tests.
DLOG_IF(WARNING, header.empty()) <<
"Missing resource: directory listing header";
« no previous file with comments | « net/base/net_module.cc ('k') | net/base/registry_controlled_domain.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698