summaryrefslogtreecommitdiffstats
path: root/apps/app_restore_service.cc
diff options
context:
space:
mode:
authoriannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-27 07:59:00 +0000
committeriannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-27 07:59:00 +0000
commitb8816a4626b9c908dd006803b1b6132bf1e4cd5d (patch)
tree1b3fd762a48cb9c284ed1d49a618e984071baf2b /apps/app_restore_service.cc
parent4c1fd7d345306af3f163081415814beaa21e88c4 (diff)
downloadchromium_src-b8816a4626b9c908dd006803b1b6132bf1e4cd5d.zip
chromium_src-b8816a4626b9c908dd006803b1b6132bf1e4cd5d.tar.gz
chromium_src-b8816a4626b9c908dd006803b1b6132bf1e4cd5d.tar.bz2
Revert "Track and persist what file entries an extension has access to."
This reverts commit 4fe61bc24f343a6a1381a782dec4fb45b2f6c437 (r184878). This was causing test failures in FileSystemApiOpenBackgroundTest and FileSystemApiSaveBackgroundTest on linux (example http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Tests%20%28dbg%29%281%29&number=23657 ) TBR=koz@chromium.org BUG= Review URL: https://codereview.chromium.org/12319140 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_restore_service.cc')
-rw-r--r--apps/app_restore_service.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/apps/app_restore_service.cc b/apps/app_restore_service.cc
index f1b3fd3..554f873 100644
--- a/apps/app_restore_service.cc
+++ b/apps/app_restore_service.cc
@@ -5,7 +5,6 @@
#include "apps/app_restore_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_service.h"
@@ -48,11 +47,9 @@ 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;
- extension_prefs->GetSavedFileEntries(extension->id(), &file_entries);
RecordAppStop(extension->id());
if (should_restore_apps)
- RestoreApp(*it, file_entries);
+ RestoreApp(*it);
}
}
}
@@ -97,13 +94,9 @@ void AppRestoreService::RecordAppStop(const std::string& extension_id) {
ExtensionPrefs* extension_prefs =
ExtensionSystem::Get(profile_)->extension_service()->extension_prefs();
extension_prefs->SetExtensionRunning(extension_id, false);
- extension_prefs->ClearSavedFileEntries(extension_id);
}
-void AppRestoreService::RestoreApp(
- const Extension* extension,
- const std::vector<SavedFileEntry>& file_entries) {
- // TODO(koz): Make |file_entries| available to the newly restarted app.
+void AppRestoreService::RestoreApp(const Extension* extension) {
AppEventRouter::DispatchOnRestartedEvent(profile_, extension);
}