OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "webkit/common/fileapi/file_system_util.h" | 5 #include "webkit/common/fileapi/file_system_util.h" |
6 | 6 |
| 7 #include <algorithm> |
| 8 |
7 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
8 #include "base/logging.h" | 10 #include "base/logging.h" |
9 #include "base/string_util.h" | 11 #include "base/string_util.h" |
10 #include "base/strings/sys_string_conversions.h" | 12 #include "base/strings/sys_string_conversions.h" |
11 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
12 #include "googleurl/src/gurl.h" | 14 #include "googleurl/src/gurl.h" |
13 #include "webkit/base/origin_url_conversions.h" | 15 #include "webkit/base/origin_url_conversions.h" |
14 | 16 |
15 namespace fileapi { | 17 namespace fileapi { |
16 | 18 |
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 if (!optional_root_name.empty()) { | 349 if (!optional_root_name.empty()) { |
348 if (base::FilePath::FromUTF8Unsafe(optional_root_name).ReferencesParent()) | 350 if (base::FilePath::FromUTF8Unsafe(optional_root_name).ReferencesParent()) |
349 return std::string(); | 351 return std::string(); |
350 root.append(optional_root_name); | 352 root.append(optional_root_name); |
351 root.append("/"); | 353 root.append("/"); |
352 } | 354 } |
353 return root; | 355 return root; |
354 } | 356 } |
355 | 357 |
356 } // namespace fileapi | 358 } // namespace fileapi |
OLD | NEW |