| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/base/net_util.h" | 5 #include "net/base/net_util.h" |
| 6 | 6 |
| 7 #include <unicode/regex.h> | 7 #include <unicode/regex.h> |
| 8 #include <unicode/ucnv.h> | 8 #include <unicode/ucnv.h> |
| 9 #include <unicode/uidna.h> | 9 #include <unicode/uidna.h> |
| 10 #include <unicode/ulocdata.h> | 10 #include <unicode/ulocdata.h> |
| (...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1217 true, &result); | 1217 true, &result); |
| 1218 } else { | 1218 } else { |
| 1219 base::JsonDoubleQuote(EscapePath(raw_bytes), true, &result); | 1219 base::JsonDoubleQuote(EscapePath(raw_bytes), true, &result); |
| 1220 } | 1220 } |
| 1221 if (is_dir) { | 1221 if (is_dir) { |
| 1222 result.append(",1,"); | 1222 result.append(",1,"); |
| 1223 } else { | 1223 } else { |
| 1224 result.append(",0,"); | 1224 result.append(",0,"); |
| 1225 } | 1225 } |
| 1226 | 1226 |
| 1227 base::JsonDoubleQuote( | 1227 base::JsonDoubleQuote(FormatBytesUnlocalized(size), true, &result); |
| 1228 FormatBytes(size, GetByteDisplayUnits(size), true), | |
| 1229 true, | |
| 1230 &result); | |
| 1231 | 1228 |
| 1232 result.append(","); | 1229 result.append(","); |
| 1233 | 1230 |
| 1234 string16 modified_str; | 1231 string16 modified_str; |
| 1235 // |modified| can be NULL in FTP listings. | 1232 // |modified| can be NULL in FTP listings. |
| 1236 if (!modified.is_null()) { | 1233 if (!modified.is_null()) { |
| 1237 modified_str = base::TimeFormatShortDateAndTime(modified); | 1234 modified_str = base::TimeFormatShortDateAndTime(modified); |
| 1238 } | 1235 } |
| 1239 base::JsonDoubleQuote(modified_str, true, &result); | 1236 base::JsonDoubleQuote(modified_str, true, &result); |
| 1240 | 1237 |
| (...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2241 | 2238 |
| 2242 NetworkInterface::NetworkInterface(const std::string& name, | 2239 NetworkInterface::NetworkInterface(const std::string& name, |
| 2243 const IPAddressNumber& address) | 2240 const IPAddressNumber& address) |
| 2244 : name(name), address(address) { | 2241 : name(name), address(address) { |
| 2245 } | 2242 } |
| 2246 | 2243 |
| 2247 NetworkInterface::~NetworkInterface() { | 2244 NetworkInterface::~NetworkInterface() { |
| 2248 } | 2245 } |
| 2249 | 2246 |
| 2250 } // namespace net | 2247 } // namespace net |
| OLD | NEW |