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/fileapi/file_system_util.h" | 5 #include "webkit/common/fileapi/file_system_util.h" |
6 | |
7 #include "build/build_config.h" | |
8 | 6 |
9 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
10 #include "base/logging.h" | 8 #include "base/logging.h" |
11 #include "base/string_util.h" | 9 #include "base/string_util.h" |
12 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
13 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
14 #include "googleurl/src/gurl.h" | 12 #include "googleurl/src/gurl.h" |
15 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h" | |
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | |
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" | |
18 #include "webkit/base/origin_url_conversions.h" | 13 #include "webkit/base/origin_url_conversions.h" |
19 | 14 |
20 namespace fileapi { | 15 namespace fileapi { |
21 | 16 |
22 const char kPersistentDir[] = "/persistent"; | 17 const char kPersistentDir[] = "/persistent"; |
23 const char kTemporaryDir[] = "/temporary"; | 18 const char kTemporaryDir[] = "/temporary"; |
24 const char kIsolatedDir[] = "/isolated"; | 19 const char kIsolatedDir[] = "/isolated"; |
25 const char kExternalDir[] = "/external"; | 20 const char kExternalDir[] = "/external"; |
26 const char kTestDir[] = "/test"; | 21 const char kTestDir[] = "/test"; |
27 | 22 |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
352 if (!optional_root_name.empty()) { | 347 if (!optional_root_name.empty()) { |
353 if (base::FilePath::FromUTF8Unsafe(optional_root_name).ReferencesParent()) | 348 if (base::FilePath::FromUTF8Unsafe(optional_root_name).ReferencesParent()) |
354 return std::string(); | 349 return std::string(); |
355 root.append(optional_root_name); | 350 root.append(optional_root_name); |
356 root.append("/"); | 351 root.append("/"); |
357 } | 352 } |
358 return root; | 353 return root; |
359 } | 354 } |
360 | 355 |
361 } // namespace fileapi | 356 } // namespace fileapi |
OLD | NEW |