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

Side by Side Diff: ppapi/shared_impl/file_ref_util.cc

Issue 121123002: Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/,… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/proxy/pdf_resource_unittest.cc ('k') | printing/backend/print_backend_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ppapi/shared_impl/file_ref_util.h" 5 #include "ppapi/shared_impl/file_ref_util.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 10
11 namespace ppapi { 11 namespace ppapi {
12 12
13 std::string GetNameForInternalFilePath(const std::string& path) { 13 std::string GetNameForInternalFilePath(const std::string& path) {
14 if (path == "/") 14 if (path == "/")
15 return path; 15 return path;
16 size_t pos = path.rfind('/'); 16 size_t pos = path.rfind('/');
17 CHECK(pos != std::string::npos); 17 CHECK(pos != std::string::npos);
18 return path.substr(pos + 1); 18 return path.substr(pos + 1);
19 } 19 }
20 20
21 std::string GetNameForExternalFilePath(const base::FilePath& path) { 21 std::string GetNameForExternalFilePath(const base::FilePath& path) {
22 const base::FilePath::StringType& file_path = path.value(); 22 const base::FilePath::StringType& file_path = path.value();
23 size_t pos = file_path.rfind(base::FilePath::kSeparators[0]); 23 size_t pos = file_path.rfind(base::FilePath::kSeparators[0]);
24 CHECK(pos != base::FilePath::StringType::npos); 24 CHECK(pos != base::FilePath::StringType::npos);
25 #if defined(OS_WIN) 25 #if defined(OS_WIN)
26 return WideToUTF8(file_path.substr(pos + 1)); 26 return base::WideToUTF8(file_path.substr(pos + 1));
27 #elif defined(OS_POSIX) 27 #elif defined(OS_POSIX)
28 return file_path.substr(pos + 1); 28 return file_path.substr(pos + 1);
29 #else 29 #else
30 #error "Unsupported platform." 30 #error "Unsupported platform."
31 #endif 31 #endif
32 } 32 }
33 33
34 bool IsValidInternalPath(const std::string& path) { 34 bool IsValidInternalPath(const std::string& path) {
35 // We check that: 35 // We check that:
36 // The path starts with '/' 36 // The path starts with '/'
(...skipping 10 matching lines...) Expand all
47 bool IsValidExternalPath(const base::FilePath& path) { 47 bool IsValidExternalPath(const base::FilePath& path) {
48 return !path.empty() && !path.ReferencesParent(); 48 return !path.empty() && !path.ReferencesParent();
49 } 49 }
50 50
51 void NormalizeInternalPath(std::string* path) { 51 void NormalizeInternalPath(std::string* path) {
52 if (path->size() > 1 && path->at(path->size() - 1) == '/') 52 if (path->size() > 1 && path->at(path->size() - 1) == '/')
53 path->erase(path->size() - 1, 1); 53 path->erase(path->size() - 1, 1);
54 } 54 }
55 55
56 } // namespace ppapi 56 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/proxy/pdf_resource_unittest.cc ('k') | printing/backend/print_backend_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698