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

Unified Diff: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

Issue 2713083003: Use ContentSetting in chrome/ instead of PermissionStatus (Closed)
Patch Set: maybe fix android compile + address comments + basic tests Created 3 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/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
index 8228d9a5cb66b05f45ec0f361f605a060183c2f3..8dab72c49aeb80bc7a6a58b3525604d018d46df9 100644
--- a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
+++ b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
@@ -25,8 +25,8 @@ namespace extensions {
namespace {
void CallbackWrapper(const base::Callback<void(bool)>& callback,
- blink::mojom::PermissionStatus status) {
- callback.Run(status == blink::mojom::PermissionStatus::GRANTED);
+ ContentSetting status) {
+ callback.Run(status == CONTENT_SETTING_ALLOW);
}
} // anonymous namespace
@@ -197,7 +197,7 @@ void ChromeWebViewPermissionHelperDelegate::RequestGeolocationPermission(
void ChromeWebViewPermissionHelperDelegate::OnGeolocationPermissionResponse(
int bridge_id,
bool user_gesture,
- const base::Callback<void(blink::mojom::PermissionStatus)>& callback,
+ const base::Callback<void(ContentSetting)>& callback,
bool allow,
const std::string& user_input) {
// The <webview> embedder has allowed the permission. We now need to make sure
@@ -205,7 +205,7 @@ void ChromeWebViewPermissionHelperDelegate::OnGeolocationPermissionResponse(
RemoveBridgeID(bridge_id);
if (!allow || !web_view_guest()->attached()) {
- callback.Run(blink::mojom::PermissionStatus::DENIED);
+ callback.Run(CONTENT_SETTING_BLOCK);
return;
}

Powered by Google App Engine
This is Rietveld 408576698