Add support for persistent file access in apps.

apps/app_restore_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/platform_app_launcher.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
@@ skipping 44 matching lines @@
 void AppRestoreService::HandleStartup(bool should_restore_apps) {
   ExtensionService* extension_service =
       ExtensionSystem::Get(profile_)->extension_service();
   const ExtensionSet* extensions = extension_service->extensions();
   ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
 
   for (ExtensionSet::const_iterator it = extensions->begin();
       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());
+      // On a Chrome restart, restore the running apps. Otherwise, on startup,

[koz (OOO until 15th September), 2013/05/23 07:32:22]

I know Matt asked for this comment but I think it's a bad idea to put this here
- ultimately whether or not apps are restored is something callers can do for
whatever reason, and that reason shouldn't be restated here.

[Matt Giuca, 2013/05/24 00:24:02]

OK I agree we shouldn't assume why the caller set this flag. But I still find
these four lines pretty eye-glazey. How about:
// If we are not restoring apps (e.g., because it is a clean restart), and the
app does not have retain permission, explicitly clear the retained entries
queue.

[koz (OOO until 15th September), 2013/05/24 00:28:44]

I love it!

[Sam McNally, 2013/05/24 00:46:03]

Done.

+      // flush the retained file entries.
       if (should_restore_apps)
-        RestoreApp(*it, file_entries);
+        RestoreApp(*it);
+      else
+        SavedFilesService::Get(profile_)->MaybeClearQueue(extension);
     }
   }
 }
 
 void AppRestoreService::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: {
       ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
@@ skipping 41 matching lines @@
 void AppRestoreService::RecordAppStart(const std::string& extension_id) {
   ExtensionPrefs* extension_prefs =
       ExtensionSystem::Get(profile_)->extension_service()->extension_prefs();
   extension_prefs->SetExtensionRunning(extension_id, true);
 }
 
 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(
     const std::string& id) {
   ExtensionService* extension_service =
       ExtensionSystem::Get(profile_)->extension_service();
   ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
 
   // If the extension isn't running then we will already have recorded whether
   // it had windows or not.
   if (!extension_prefs->IsExtensionRunning(id))
     return;
 
   extensions::ShellWindowRegistry* shell_window_registry =
       extensions::ShellWindowRegistry::Factory::GetForProfile(
           profile_, false /* create */);
   if (!shell_window_registry)
     return;
   bool has_windows = !shell_window_registry->GetShellWindowsForApp(id).empty();
   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() {
   extensions::ShellWindowRegistry* shell_window_registry =
       extensions::ShellWindowRegistry::Factory::GetForProfile(
           profile_, false /* create */);
   if (shell_window_registry)
     shell_window_registry->AddObserver(this);
 }
 
 void AppRestoreService::StopObservingShellWindows() {
   extensions::ShellWindowRegistry* shell_window_registry =
       extensions::ShellWindowRegistry::Factory::GetForProfile(
           profile_, false /* create */);
   if (shell_window_registry)
     shell_window_registry->RemoveObserver(this);
 }
 
 }  // namespace apps