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

Unified Diff: net/base/directory_listing.cc

Issue 1548503002: net: extract GetDirectoryListingXXX functions into directory_listing.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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: net/base/directory_listing.cc
diff --git a/net/base/net_util_icu.cc b/net/base/directory_listing.cc
similarity index 67%
rename from net/base/net_util_icu.cc
rename to net/base/directory_listing.cc
index 62766c1ff878aa2c69625de5fc159c43c018f610..e9ff4e9da0f6971747aaa4ca1c3f408651f32f2c 100644
--- a/net/base/net_util_icu.cc
+++ b/net/base/directory_listing.cc
@@ -1,18 +1,39 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "net/base/net_util.h"
+#include "net/base/directory_listing.h"
#include "base/i18n/time_formatting.h"
#include "base/json/string_escape.h"
-#include "base/strings/string_util.h"
+#include "base/logging.h"
+#include "base/strings/string_piece.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "net/base/escape.h"
+#include "net/base/net_module.h"
+#include "net/grit/net_resources.h"
namespace net {
+std::string GetDirectoryListingHeader(const base::string16& title) {
+ 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";
+
+ std::string result;
+ if (!header.empty())
+ result.assign(header.data(), header.size());
+
+ result.append("<script>start(");
+ base::EscapeJSONString(title, true, &result);
+ result.append(");</script>\n");
+
+ return result;
+}
+
std::string GetDirectoryListingEntry(const base::string16& name,
const std::string& raw_bytes,
bool is_dir,

Powered by Google App Engine
This is Rietveld 408576698