Chromium Code Reviews| Index: apps/app_restore_service.cc |
| diff --git a/apps/app_restore_service.cc b/apps/app_restore_service.cc |
| index a567811289f4d1f5b2b6d41d75b0fe3edcc226c1..988b3c616dd219e7c0de37c30f3c815476689ba1 100644 |
| --- a/apps/app_restore_service.cc |
| +++ b/apps/app_restore_service.cc |
| @@ -4,8 +4,8 @@ |
| #include "apps/app_restore_service.h" |
| +#include "apps/saved_files_service.h" |
| #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h" |
| -#include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" |
| #include "chrome/browser/extensions/event_router.h" |
| #include "chrome/browser/extensions/extension_host.h" |
| #include "chrome/browser/extensions/extension_prefs.h" |
| @@ -70,13 +70,11 @@ void AppRestoreService::HandleStartup(bool should_restore_apps) { |
| it != extensions->end(); ++it) { |
| const Extension* extension = *it; |
| if (extension_prefs->IsExtensionRunning(extension->id())) { |
| - std::vector<SavedFileEntry> file_entries; |
| - extensions::app_file_handler_util::GetSavedFileEntries(extension_prefs, |
| - extension->id(), |
| - &file_entries); |
| RecordAppStop(extension->id()); |
| if (should_restore_apps) |
|
Matt Giuca
2013/05/20 01:32:57
Not your fault, but can you please add a comment h
Sam McNally
2013/05/20 04:25:20
Done.
|
| - RestoreApp(*it, file_entries); |
| + RestoreApp(*it); |
| + else |
| + SavedFilesService::Get(profile_)->ClearRetainedFiles(extension); |
| } |
| } |
| } |
| @@ -138,8 +136,6 @@ void AppRestoreService::RecordAppStop(const std::string& extension_id) { |
| ExtensionPrefs* extension_prefs = |
| ExtensionSystem::Get(profile_)->extension_service()->extension_prefs(); |
| extension_prefs->SetExtensionRunning(extension_id, false); |
| - extensions::app_file_handler_util::ClearSavedFileEntries( |
| - extension_prefs, extension_id); |
| } |
| void AppRestoreService::RecordIfAppHasWindows( |
| @@ -162,12 +158,8 @@ void AppRestoreService::RecordIfAppHasWindows( |
| extension_prefs->SetHasWindows(id, has_windows); |
| } |
| -void AppRestoreService::RestoreApp( |
| - const Extension* extension, |
| - const std::vector<SavedFileEntry>& file_entries) { |
| - extensions::RestartPlatformAppWithFileEntries(profile_, |
| - extension, |
| - file_entries); |
| +void AppRestoreService::RestoreApp(const Extension* extension) { |
| + extensions::RestartPlatformApp(profile_, extension); |
| } |
| void AppRestoreService::StartObservingShellWindows() { |