| Index: extensions/browser/extension_function_dispatcher.cc
|
| diff --git a/extensions/browser/extension_function_dispatcher.cc b/extensions/browser/extension_function_dispatcher.cc
|
| index f9bbec561b911df0eadb21606c01769ed0b4916f..5edb3ecd41da0fbcd4c673fe48c502b9a7396bbe 100644
|
| --- a/extensions/browser/extension_function_dispatcher.cc
|
| +++ b/extensions/browser/extension_function_dispatcher.cc
|
| @@ -229,8 +229,6 @@ void ExtensionFunctionDispatcher::DispatchOnIOThread(
|
| const ExtensionHostMsg_Request_Params& params) {
|
| const Extension* extension =
|
| extension_info_map->extensions().GetByID(params.extension_id);
|
| - if (!extension)
|
| - return;
|
|
|
| ExtensionFunction::ResponseCallback callback(
|
| base::Bind(&IOThreadResponseCallback, ipc_sender, routing_id,
|
| @@ -255,12 +253,21 @@ void ExtensionFunctionDispatcher::DispatchOnIOThread(
|
| }
|
| function_io->set_ipc_sender(ipc_sender, routing_id);
|
| function_io->set_extension_info_map(extension_info_map);
|
| - function->set_include_incognito(
|
| - extension_info_map->IsIncognitoEnabled(extension->id()));
|
| + if (extension) {
|
| + function->set_include_incognito(
|
| + extension_info_map->IsIncognitoEnabled(extension->id()));
|
| + }
|
|
|
| if (!CheckPermissions(function.get(), params, callback))
|
| return;
|
|
|
| + if (!extension) {
|
| + // Skip all of the UMA, quota, event page, activity logging stuff if there
|
| + // isn't an extension, e.g. if the function call was from WebUI.
|
| + function->Run()->Execute();
|
| + return;
|
| + }
|
| +
|
| QuotaService* quota = extension_info_map->GetQuotaService();
|
| std::string violation_error = quota->Assess(extension->id(),
|
| function.get(),
|
|
|