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

Unified Diff: chrome/browser/chromeos/extensions/file_handler_util.cc

Issue 10804020: Introduce runtime.onSuspendCanceled() event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos call Created 8 years, 5 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
Index: chrome/browser/chromeos/extensions/file_handler_util.cc
diff --git a/chrome/browser/chromeos/extensions/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_handler_util.cc
index 10345a640900fd4bb3b17b90b1c5196ea6f5850e..8553f778f67b9a10ee93245a777c10999f2635e3 100644
--- a/chrome/browser/chromeos/extensions/file_handler_util.cc
+++ b/chrome/browser/chromeos/extensions/file_handler_util.cc
@@ -770,23 +770,11 @@ void ExtensionTaskExecutor::OnInitAccessForExecuteFileActionsOnUIThread(
return;
}
- if (handler_pid > 0) {
Matt Perry 2012/07/24 19:25:15 This potentially changes the behavior.. If handler
koz (OOO until 15th September) 2012/07/25 07:48:31 Ah, true. We probably only want to change the else
- SetupPermissionsAndDispatchEvent(file_system_name, file_system_root,
- file_list, handler_pid, NULL);
- } else {
- // We have to wake the handler background page before we proceed.
- extensions::LazyBackgroundTaskQueue* queue =
- extensions::ExtensionSystem::Get(profile())->
- lazy_background_task_queue();
- if (!queue->ShouldEnqueueTask(profile(), extension)) {
- ExecuteDoneOnUIThread(false);
- return;
- }
- queue->AddPendingTask(
- profile(), extension_id_,
- base::Bind(&ExtensionTaskExecutor::SetupPermissionsAndDispatchEvent,
- this, file_system_name, file_system_root, file_list,
- handler_pid));
+ queue->AddPendingTask(
+ profile(), extension_id_,
+ base::Bind(&ExtensionTaskExecutor::SetupPermissionsAndDispatchEvent,
+ this, file_system_name, file_system_root, file_list,
+ handler_pid));
}
}

Powered by Google App Engine
This is Rietveld 408576698