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 "components/profile_service/profile_service_impl.h" | 5 #include "components/profile_service/profile_service_impl.h" |
6 | 6 |
7 #include "base/bind.h" | |
7 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
8 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
9 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
10 #include "components/filesystem/directory_impl.h" | 11 #include "components/filesystem/directory_impl.h" |
11 #include "components/filesystem/lock_table.h" | 12 #include "components/filesystem/lock_table.h" |
12 #include "mojo/shell/public/cpp/connection.h" | 13 #include "mojo/shell/public/cpp/connection.h" |
13 | 14 |
14 namespace profile { | 15 namespace profile { |
15 | 16 |
16 ProfileServiceImpl::ProfileServiceImpl( | 17 ProfileServiceImpl::ProfileServiceImpl( |
17 mojo::Connection* connection, | 18 mojo::Connection* connection, |
18 mojo::InterfaceRequest<ProfileService> request, | 19 mojo::InterfaceRequest<ProfileService> request, |
20 base::Closure on_service_destroyed, | |
19 base::FilePath base_profile_dir, | 21 base::FilePath base_profile_dir, |
20 filesystem::LockTable* lock_table) | 22 filesystem::LockTable* lock_table) |
21 : binding_(this, std::move(request)), | 23 : binding_(this, std::move(request)), |
24 on_service_destroyed_(on_service_destroyed), | |
22 lock_table_(lock_table), | 25 lock_table_(lock_table), |
23 path_(base_profile_dir) { | 26 path_(base_profile_dir) { |
24 if (!base::PathExists(path_)) | 27 if (!base::PathExists(path_)) |
25 base::CreateDirectory(path_); | 28 base::CreateDirectory(path_); |
29 binding_.set_connection_error_handler(base::Bind( | |
30 &ProfileServiceImpl::OnConnectionError, base::Unretained(this))); | |
26 } | 31 } |
27 | 32 |
28 ProfileServiceImpl::~ProfileServiceImpl() { | 33 ProfileServiceImpl::~ProfileServiceImpl() {} |
29 } | |
30 | 34 |
31 void ProfileServiceImpl::GetDirectory( | 35 void ProfileServiceImpl::GetDirectory( |
32 mojo::InterfaceRequest<filesystem::Directory> request) { | 36 mojo::InterfaceRequest<filesystem::Directory> request, |
37 const GetDirectoryCallback& callback) { | |
michaeln
2016/03/05 01:38:54
Would it make sense to have a variant that accepts
Elliot Glaysher
2016/03/10 21:00:35
Yes. Previously that's how this worked, but in a p
| |
33 new filesystem::DirectoryImpl(std::move(request), | 38 new filesystem::DirectoryImpl(std::move(request), |
34 path_, | 39 path_, |
35 scoped_ptr<base::ScopedTempDir>(), | 40 scoped_ptr<base::ScopedTempDir>(), |
36 lock_table_); | 41 lock_table_); |
42 callback.Run(filesystem::FileError::OK); | |
43 } | |
44 | |
45 void ProfileServiceImpl::OnConnectionError() { | |
46 on_service_destroyed_.Run(); | |
37 } | 47 } |
38 | 48 |
39 } // namespace profile | 49 } // namespace profile |
OLD | NEW |