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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android geolocation breakage Created 5 years, 10 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/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index be00c5c456562636282576bdfb0288ac96e48f09..b4b89db48f50ac7ecd94a70d3059777ba32c834f 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -680,6 +680,12 @@ ContentSettingsType PermissionToContentSetting(
}
}
+void OnRequestPermission(
+ const base::Callback<void(content::PermissionStatus)>& callback,
+ ContentSetting content_setting) {
+ callback.Run(ContentSettingToPermissionStatus(content_setting));
+}
+
} // namespace
namespace chrome {
@@ -1934,7 +1940,7 @@ void ChromeContentBrowserClient::RequestPermission(
int bridge_id,
const GURL& requesting_frame,
bool user_gesture,
- const base::Callback<void(bool)>& result_callback) {
+ const base::Callback<void(content::PermissionStatus)>& result_callback) {
int render_process_id = web_contents->GetRenderProcessHost()->GetID();
int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
const PermissionRequestID request_id(render_process_id,
@@ -1949,7 +1955,8 @@ void ChromeContentBrowserClient::RequestPermission(
return;
context->RequestPermission(web_contents, request_id, requesting_frame,
- user_gesture, result_callback);
+ user_gesture,
+ base::Bind(&OnRequestPermission, result_callback));
}
content::PermissionStatus ChromeContentBrowserClient::GetPermissionStatus(

Powered by Google App Engine
This is Rietveld 408576698