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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 14607023: Add support for persistent file access in apps. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/extensions/platform_app_launcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 6cfddc3a1ae65fd5e3166b31eba1253d8ee50e58..820322c19035cbe85c2fd61fe040aff882eb3236 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -32,7 +32,6 @@
#include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"
#include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
-#include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h"
#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
#include "chrome/browser/extensions/api/runtime/runtime_api.h"
#include "chrome/browser/extensions/api/storage/settings_frontend.h"
@@ -734,13 +733,6 @@ void ExtensionService::ReloadExtensionWithEvents(
}
on_load_events_[extension_id] = events;
- if (events & EVENT_RESTARTED) {
- extensions::app_file_handler_util::GetSavedFileEntries(
- extension_prefs_,
- extension_id,
- &on_restart_file_entries_[extension_id]);
- }
-
if (delayed_updates_for_idle_.Contains(extension_id)) {
FinishDelayedInstallation(extension_id);
@@ -2907,14 +2899,8 @@ void ExtensionService::DoPostLoadTasks(const Extension* extension) {
queue->AddPendingTask(profile(), extension->id(),
base::Bind(&ExtensionService::LaunchApplication));
if (events_to_fire & EVENT_RESTARTED) {
- SavedFileEntryMap::iterator it =
- on_restart_file_entries_.find(extension->id());
- if (it == on_restart_file_entries_.end())
- NOTREACHED();
queue->AddPendingTask(profile(), extension->id(),
- base::Bind(&ExtensionService::RestartApplication,
- it->second));
- on_restart_file_entries_.erase(it);
+ base::Bind(&ExtensionService::RestartApplication));
}
}
@@ -2936,14 +2922,13 @@ void ExtensionService::LaunchApplication(
// static
void ExtensionService::RestartApplication(
- std::vector<extensions::app_file_handler_util::SavedFileEntry> file_entries,
extensions::ExtensionHost* extension_host) {
if (!extension_host)
return;
#if !defined(OS_ANDROID)
- extensions::RestartPlatformAppWithFileEntries(
- extension_host->profile(), extension_host->extension(), file_entries);
+ extensions::RestartPlatformApp(
+ extension_host->profile(), extension_host->extension());
#endif
}
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/extensions/platform_app_launcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698