| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "services/user/user_service.h" | 5 #include "services/user/user_service.h" |
| 6 | 6 |
| 7 #include "base/files/file.h" | 7 #include "base/files/file.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 12 #include "components/filesystem/directory_impl.h" | 12 #include "components/filesystem/directory_impl.h" |
| 13 #include "components/filesystem/lock_table.h" | 13 #include "components/filesystem/lock_table.h" |
| 14 #include "components/filesystem/public/interfaces/types.mojom.h" | 14 #include "components/filesystem/public/interfaces/types.mojom.h" |
| 15 #include "services/shell/public/cpp/connection.h" | 15 #include "services/shell/public/cpp/connection.h" |
| 16 #include "services/shell/public/cpp/message_loop_ref.h" | 16 #include "services/shell/public/cpp/message_loop_ref.h" |
| 17 | 17 |
| 18 namespace user_service { | 18 namespace user_service { |
| 19 | 19 |
| 20 UserService::UserService(const base::FilePath& base_user_dir, | 20 UserService::UserService(const base::FilePath& base_user_dir, |
| 21 const scoped_refptr<filesystem::LockTable>& lock_table) | 21 const scoped_refptr<filesystem::LockTable>& lock_table) |
| 22 : lock_table_(lock_table), path_(base_user_dir) { | 22 : lock_table_(lock_table), path_(base_user_dir) { |
| 23 base::CreateDirectory(path_); | 23 base::CreateDirectory(path_); |
| 24 } | 24 } |
| 25 | 25 |
| 26 UserService::~UserService() {} | 26 UserService::~UserService() {} |
| 27 | 27 |
| 28 void UserService::GetDirectory(filesystem::DirectoryRequest request, | 28 void UserService::GetDirectory(filesystem::DirectoryRequest request, |
| 29 const GetDirectoryCallback& callback) { | 29 const GetDirectoryCallback& callback) { |
| 30 new filesystem::DirectoryImpl(std::move(request), | 30 new filesystem::DirectoryImpl(std::move(request), path_, |
| 31 path_, | 31 std::unique_ptr<base::ScopedTempDir>(), |
| 32 scoped_ptr<base::ScopedTempDir>(), | |
| 33 lock_table_); | 32 lock_table_); |
| 34 callback.Run(); | 33 callback.Run(); |
| 35 } | 34 } |
| 36 | 35 |
| 37 void UserService::GetSubDirectory(const mojo::String& sub_directory_path, | 36 void UserService::GetSubDirectory(const mojo::String& sub_directory_path, |
| 38 filesystem::DirectoryRequest request, | 37 filesystem::DirectoryRequest request, |
| 39 const GetSubDirectoryCallback& callback) { | 38 const GetSubDirectoryCallback& callback) { |
| 40 // Ensure that we've made |subdirectory| recursively under our user dir. | 39 // Ensure that we've made |subdirectory| recursively under our user dir. |
| 41 base::FilePath subdir = path_.Append( | 40 base::FilePath subdir = path_.Append( |
| 42 #if defined(OS_WIN) | 41 #if defined(OS_WIN) |
| 43 base::UTF8ToWide(sub_directory_path.To<std::string>())); | 42 base::UTF8ToWide(sub_directory_path.To<std::string>())); |
| 44 #else | 43 #else |
| 45 sub_directory_path.To<std::string>()); | 44 sub_directory_path.To<std::string>()); |
| 46 #endif | 45 #endif |
| 47 base::File::Error error; | 46 base::File::Error error; |
| 48 if (!base::CreateDirectoryAndGetError(subdir, &error)) { | 47 if (!base::CreateDirectoryAndGetError(subdir, &error)) { |
| 49 callback.Run(static_cast<filesystem::FileError>(error)); | 48 callback.Run(static_cast<filesystem::FileError>(error)); |
| 50 return; | 49 return; |
| 51 } | 50 } |
| 52 | 51 |
| 53 new filesystem::DirectoryImpl(std::move(request), subdir, | 52 new filesystem::DirectoryImpl(std::move(request), subdir, |
| 54 scoped_ptr<base::ScopedTempDir>(), lock_table_); | 53 std::unique_ptr<base::ScopedTempDir>(), |
| 54 lock_table_); |
| 55 callback.Run(filesystem::FileError::OK); | 55 callback.Run(filesystem::FileError::OK); |
| 56 } | 56 } |
| 57 | 57 |
| 58 } // namespace user_service | 58 } // namespace user_service |
| OLD | NEW |