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

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

Issue 2884040: Rename ExternalProtocolHandler::OnUserGesture -> PermitLaunchUrl & call from EFD::HandleRequest (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: cr changes Created 10 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
« no previous file with comments | « no previous file | chrome/browser/external_protocol_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_function_dispatcher.cc
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 4959310be3f8e1c46e66db133f687323cedb1b1d..d22cfe6449a2bcb23d10ecec98491a87a9892961 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/browser_window.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
+#include "chrome/browser/external_protocol_handler.h"
#include "chrome/browser/extensions/execute_code_in_tab_function.h"
#include "chrome/browser/extensions/extension_accessibility_api.h"
#include "chrome/browser/extensions/extension_bookmark_manager_api.h"
@@ -412,6 +413,9 @@ void ExtensionFunctionDispatcher::HandleRequest(const std::string& name,
ExtensionsQuotaService* quota = service->quota_service();
if (quota->Assess(extension_id(), function, args, base::TimeTicks::Now())) {
+ // See crbug.com/39178.
+ ExternalProtocolHandler::PermitLaunchUrl();
+
function->Run();
} else {
render_view_host_->SendExtensionResponse(function->request_id(), false,
« no previous file with comments | « no previous file | chrome/browser/external_protocol_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698