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

Side by Side Diff: webkit/browser/fileapi/local_file_util.cc

Issue 15959006: Deprecate FileSystemMountPointProvider::GetFileSystemRootPathOnFileThread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
OLDNEW
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/browser/fileapi/local_file_util.h" 5 #include "webkit/browser/fileapi/local_file_util.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_util_proxy.h" 8 #include "base/files/file_util_proxy.h"
9 #include "googleurl/src/gurl.h" 9 #include "googleurl/src/gurl.h"
10 #include "webkit/browser/fileapi/file_system_context.h" 10 #include "webkit/browser/fileapi/file_system_context.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 .PassAs<FileSystemFileUtil::AbstractFileEnumerator>(); 157 .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
158 } 158 }
159 159
160 PlatformFileError LocalFileUtil::GetLocalFilePath( 160 PlatformFileError LocalFileUtil::GetLocalFilePath(
161 FileSystemOperationContext* context, 161 FileSystemOperationContext* context,
162 const FileSystemURL& url, 162 const FileSystemURL& url,
163 base::FilePath* local_file_path) { 163 base::FilePath* local_file_path) {
164 FileSystemMountPointProvider* provider = 164 FileSystemMountPointProvider* provider =
165 context->file_system_context()->GetMountPointProvider(url.type()); 165 context->file_system_context()->GetMountPointProvider(url.type());
166 DCHECK(provider); 166 DCHECK(provider);
167 base::FilePath root = provider->GetFileSystemRootPathOnFileThread(url, false); 167 base::FilePath root = context->root_path();
168 if (root.empty()) 168 if (root.empty())
169 return base::PLATFORM_FILE_ERROR_NOT_FOUND; 169 return base::PLATFORM_FILE_ERROR_NOT_FOUND;
170 *local_file_path = root.Append(url.path()); 170 *local_file_path = root.Append(url.path());
171 return base::PLATFORM_FILE_OK; 171 return base::PLATFORM_FILE_OK;
172 } 172 }
173 173
174 PlatformFileError LocalFileUtil::Touch( 174 PlatformFileError LocalFileUtil::Touch(
175 FileSystemOperationContext* context, 175 FileSystemOperationContext* context,
176 const FileSystemURL& url, 176 const FileSystemURL& url,
177 const base::Time& last_access_time, 177 const base::Time& last_access_time,
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 base::FilePath* platform_path) { 255 base::FilePath* platform_path) {
256 DCHECK(file_info); 256 DCHECK(file_info);
257 // We're just returning the local file information. 257 // We're just returning the local file information.
258 *error = GetFileInfo(context, url, file_info, platform_path); 258 *error = GetFileInfo(context, url, file_info, platform_path);
259 if (*error == base::PLATFORM_FILE_OK && file_info->is_directory) 259 if (*error == base::PLATFORM_FILE_OK && file_info->is_directory)
260 *error = base::PLATFORM_FILE_ERROR_NOT_A_FILE; 260 *error = base::PLATFORM_FILE_ERROR_NOT_A_FILE;
261 return webkit_blob::ScopedFile(); 261 return webkit_blob::ScopedFile();
262 } 262 }
263 263
264 } // namespace fileapi 264 } // namespace fileapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698