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

Side by Side Diff: chrome/browser/chromeos/file_system_provider/service.cc

Issue 295413002: [fsp] Store mounted file systems in preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up. Created 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/chromeos/file_system_provider/service.h" 5 #include "chrome/browser/chromeos/file_system_provider/service.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/prefs/pref_service.h"
9 #include "base/prefs/scoped_user_pref_update.h"
8 #include "base/stl_util.h" 10 #include "base/stl_util.h"
9 #include "chrome/browser/chromeos/file_system_provider/mount_path_util.h" 11 #include "chrome/browser/chromeos/file_system_provider/mount_path_util.h"
10 #include "chrome/browser/chromeos/file_system_provider/observer.h" 12 #include "chrome/browser/chromeos/file_system_provider/observer.h"
11 #include "chrome/browser/chromeos/file_system_provider/provided_file_system.h" 13 #include "chrome/browser/chromeos/file_system_provider/provided_file_system.h"
12 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info .h" 14 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info .h"
13 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_inte rface.h" 15 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_inte rface.h"
14 #include "chrome/browser/chromeos/file_system_provider/service_factory.h" 16 #include "chrome/browser/chromeos/file_system_provider/service_factory.h"
17 #include "chrome/common/pref_names.h"
18 #include "components/pref_registry/pref_registry_syncable.h"
15 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
16 #include "extensions/browser/event_router.h" 20 #include "extensions/browser/event_router.h"
17 #include "extensions/browser/extension_registry.h" 21 #include "extensions/browser/extension_registry.h"
18 #include "extensions/browser/extension_system.h" 22 #include "extensions/browser/extension_system.h"
19 #include "webkit/browser/fileapi/external_mount_points.h" 23 #include "webkit/browser/fileapi/external_mount_points.h"
20 24
21 using content::BrowserThread; 25 using content::BrowserThread;
22 26
23 namespace chromeos { 27 namespace chromeos {
24 namespace file_system_provider { 28 namespace file_system_provider {
25 namespace { 29 namespace {
26 30
27 // Maximum number of file systems to be mounted in the same time, per profile. 31 // Maximum number of file systems to be mounted in the same time, per profile.
28 const size_t kMaxFileSystems = 16; 32 const size_t kMaxFileSystems = 16;
29 33
30 // Default factory for provided file systems. The |event_router| must not be 34 // Default factory for provided file systems. The |event_router| must not be
31 // NULL. 35 // NULL.
32 ProvidedFileSystemInterface* CreateProvidedFileSystem( 36 ProvidedFileSystemInterface* CreateProvidedFileSystem(
33 extensions::EventRouter* event_router, 37 extensions::EventRouter* event_router,
34 const ProvidedFileSystemInfo& file_system_info) { 38 const ProvidedFileSystemInfo& file_system_info) {
35 DCHECK(event_router); 39 DCHECK(event_router);
36 return new ProvidedFileSystem(event_router, file_system_info); 40 return new ProvidedFileSystem(event_router, file_system_info);
37 } 41 }
38 42
39 } // namespace 43 } // namespace
40 44
45 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
46 registry->RegisterDictionaryPref(
47 prefs::kFSPMountedFileSystems,
48 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
49 }
50
41 Service::Service(Profile* profile, 51 Service::Service(Profile* profile,
42 extensions::ExtensionRegistry* extension_registry) 52 extensions::ExtensionRegistry* extension_registry)
43 : profile_(profile), 53 : profile_(profile),
44 extension_registry_(extension_registry), 54 extension_registry_(extension_registry),
45 file_system_factory_(base::Bind(CreateProvidedFileSystem)), 55 file_system_factory_(base::Bind(CreateProvidedFileSystem)),
46 weak_ptr_factory_(this) { 56 weak_ptr_factory_(this) {
47 extension_registry_->AddObserver(this); 57 extension_registry_->AddObserver(this);
48 } 58 }
49 59
50 Service::~Service() { 60 Service::~Service() {
51 extension_registry_->RemoveObserver(this); 61 extension_registry_->RemoveObserver(this);
62 RememberFileSystems();
52 63
53 ProvidedFileSystemMap::iterator it = file_system_map_.begin(); 64 ProvidedFileSystemMap::iterator it = file_system_map_.begin();
54 while (it != file_system_map_.end()) { 65 while (it != file_system_map_.end()) {
55 const std::string file_system_id = 66 const std::string file_system_id =
56 it->second->GetFileSystemInfo().file_system_id(); 67 it->second->GetFileSystemInfo().file_system_id();
57 const std::string extension_id = 68 const std::string extension_id =
58 it->second->GetFileSystemInfo().extension_id(); 69 it->second->GetFileSystemInfo().extension_id();
59 ++it; 70 ++it;
60 UnmountFileSystem(extension_id, file_system_id); 71 UnmountFileSystem(extension_id, file_system_id);
61 } 72 }
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 if (file_system_it == file_system_map_.end()) 255 if (file_system_it == file_system_map_.end())
245 return NULL; 256 return NULL;
246 257
247 return file_system_it->second; 258 return file_system_it->second;
248 } 259 }
249 260
250 void Service::OnExtensionUnloaded( 261 void Service::OnExtensionUnloaded(
251 content::BrowserContext* browser_context, 262 content::BrowserContext* browser_context,
252 const extensions::Extension* extension, 263 const extensions::Extension* extension,
253 extensions::UnloadedExtensionInfo::Reason reason) { 264 extensions::UnloadedExtensionInfo::Reason reason) {
265 // If the reason is not a profile shutdown, then forget the mounted file
266 // systems from preferences.
267 if (reason != extensions::UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN)
268 ForgetFileSystems(extension->id());
269
254 // Unmount all of the provided file systems associated with this extension. 270 // Unmount all of the provided file systems associated with this extension.
255 ProvidedFileSystemMap::iterator it = file_system_map_.begin(); 271 ProvidedFileSystemMap::iterator it = file_system_map_.begin();
256 while (it != file_system_map_.end()) { 272 while (it != file_system_map_.end()) {
257 const ProvidedFileSystemInfo& file_system_info = 273 const ProvidedFileSystemInfo& file_system_info =
258 it->second->GetFileSystemInfo(); 274 it->second->GetFileSystemInfo();
259 // Advance the iterator beforehand, otherwise it will become invalidated 275 // Advance the iterator beforehand, otherwise it will become invalidated
260 // by the UnmountFileSystem() call. 276 // by the UnmountFileSystem() call.
261 ++it; 277 ++it;
262 if (file_system_info.extension_id() == extension->id()) { 278 if (file_system_info.extension_id() == extension->id()) {
263 bool result = UnmountFileSystem(file_system_info.extension_id(), 279 bool result = UnmountFileSystem(file_system_info.extension_id(),
264 file_system_info.file_system_id()); 280 file_system_info.file_system_id());
265 DCHECK(result); 281 DCHECK(result);
266 } 282 }
267 } 283 }
268 } 284 }
269 285
286 void Service::OnExtensionLoaded(content::BrowserContext* browser_context,
287 const extensions::Extension* extension) {
288 RestoreFileSystems(extension->id());
289 }
290
270 ProvidedFileSystemInterface* Service::GetProvidedFileSystem( 291 ProvidedFileSystemInterface* Service::GetProvidedFileSystem(
271 const std::string& mount_point_name) { 292 const std::string& mount_point_name) {
272 DCHECK_CURRENTLY_ON(BrowserThread::UI); 293 DCHECK_CURRENTLY_ON(BrowserThread::UI);
273 294
274 const MountPointNameToKeyMap::const_iterator mapping_it = 295 const MountPointNameToKeyMap::const_iterator mapping_it =
275 mount_point_name_to_key_map_.find(mount_point_name); 296 mount_point_name_to_key_map_.find(mount_point_name);
276 if (mapping_it == mount_point_name_to_key_map_.end()) 297 if (mapping_it == mount_point_name_to_key_map_.end())
277 return NULL; 298 return NULL;
278 299
279 const ProvidedFileSystemMap::const_iterator file_system_it = 300 const ProvidedFileSystemMap::const_iterator file_system_it =
(...skipping 10 matching lines...) Expand all
290 // Notify observers about failure in unmounting, since mount() will not be 311 // Notify observers about failure in unmounting, since mount() will not be
291 // called by the provided file system. In case of success mount() will be 312 // called by the provided file system. In case of success mount() will be
292 // invoked, and observers notified, so there is no need to call them now. 313 // invoked, and observers notified, so there is no need to call them now.
293 if (error != base::File::FILE_OK) { 314 if (error != base::File::FILE_OK) {
294 FOR_EACH_OBSERVER(Observer, 315 FOR_EACH_OBSERVER(Observer,
295 observers_, 316 observers_,
296 OnProvidedFileSystemUnmount(file_system_info, error)); 317 OnProvidedFileSystemUnmount(file_system_info, error));
297 } 318 }
298 } 319 }
299 320
321 void Service::RememberFileSystems() {
322 base::DictionaryValue extensions;
323 const std::vector<ProvidedFileSystemInfo> file_system_info_list =
324 GetProvidedFileSystemInfoList();
325
326 for (std::vector<ProvidedFileSystemInfo>::const_iterator it =
327 file_system_info_list.begin();
328 it != file_system_info_list.end();
329 ++it) {
330 base::ListValue* file_systems = NULL;
331 if (!extensions.GetList(it->extension_id(), &file_systems)) {
332 file_systems = new base::ListValue();
333 extensions.Set(it->extension_id(), file_systems);
334 }
335
336 base::DictionaryValue* file_system = new base::DictionaryValue();
337 file_system->SetString("file_system_id", it->file_system_id());
338 file_system->SetString("file_system_name", it->file_system_name());
hashimoto 2014/05/26 08:35:38 These keys should be constants.
mtomasz 2014/05/27 02:10:27 Done.
339 file_systems->Append(file_system);
340 }
341
342 PrefService* pref_service = profile_->GetPrefs();
343 DCHECK(pref_service);
344 pref_service->Set(prefs::kFSPMountedFileSystems, extensions);
hashimoto 2014/05/26 08:35:38 This overwrites the previously saved data. Doesn't
mtomasz 2014/05/27 02:10:27 Yes, this basically remembers all *currently mount
mtomasz 2014/05/27 02:13:43 This is because loading is synchronous. All instal
345 pref_service->CommitPendingWrite();
346 }
347
348 void Service::ForgetFileSystems(const std::string& extension_id) {
349 PrefService* pref_service = profile_->GetPrefs();
350 DCHECK(pref_service);
351
352 DictionaryPrefUpdate update(pref_service, prefs::kFSPMountedFileSystems);
353 base::DictionaryValue* extensions = update.Get();
354 DCHECK(extensions);
355
356 extensions->Remove(extension_id, NULL);
357 }
358
359 void Service::RestoreFileSystems(const std::string& extension_id) {
360 PrefService* pref_service = profile_->GetPrefs();
361 DCHECK(pref_service);
362
363 const base::DictionaryValue* extensions =
364 pref_service->GetDictionary(prefs::kFSPMountedFileSystems);
365 DCHECK(extensions);
366
367 const base::ListValue* file_systems;
hashimoto 2014/05/26 08:35:38 nit: Initialize this with NULL.
mtomasz 2014/05/27 02:10:27 Done.
368
369 if (!extensions->GetList(extension_id, &file_systems))
hashimoto 2014/05/26 08:35:38 Why other GetXXX calls are only DCHECKing the resu
mtomasz 2014/05/27 01:13:14 Extension doesn't need to be in preferences, eg. i
hashimoto 2014/05/27 11:29:24 Then maybe we should emit LOG for empty file_syste
mtomasz 2014/05/28 02:02:19 Done.
370 return;
371
372 for (size_t i = 0; i < file_systems->GetSize(); ++i) {
373 const base::DictionaryValue* file_system = NULL;
374 file_systems->GetDictionary(i, &file_system);
375 DCHECK(file_system);
376
377 std::string file_system_id;
378 file_system->GetString("file_system_id", &file_system_id);
379 DCHECK(!file_system_id.empty());
380
381 std::string file_system_name;
382 file_system->GetString("file_system_name", &file_system_name);
383 DCHECK(!file_system_name.empty());
384
385 if (file_system_id.empty() || file_system_name.empty())
386 continue;
387
388 const bool result =
389 MountFileSystem(extension_id, file_system_id, file_system_name);
390 if (!result) {
391 LOG(ERROR) << "Failed to restore a provided file system from "
392 << "preferences: " << extension_id << ", " << file_system_id
393 << ", " << file_system_name << ".";
394 }
395 }
396 }
397
300 } // namespace file_system_provider 398 } // namespace file_system_provider
301 } // namespace chromeos 399 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698