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

Unified Diff: chrome/browser/permissions/permission_request_impl.cc

Issue 2258763002: Add a feature-controlled persistence checkbox to geolocation prompts on desktop Views platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-infobardelegate-clean
Patch Set: Rebase, add dependent Created 4 years, 4 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/permissions/permission_request_impl.cc
diff --git a/chrome/browser/permissions/permission_request_impl.cc b/chrome/browser/permissions/permission_request_impl.cc
index feb02d3af6353ba849f244936d76bc8f6602fbd6..3a13739747786490b2b6562038c92c5b785c83aa 100644
--- a/chrome/browser/permissions/permission_request_impl.cc
+++ b/chrome/browser/permissions/permission_request_impl.cc
@@ -7,6 +7,7 @@
#include "build/build_config.h"
#include "chrome/browser/permissions/permission_decision_auto_blocker.h"
#include "chrome/browser/permissions/permission_uma_util.h"
+#include "chrome/browser/permissions/permission_util.h"
#include "chrome/grit/generated_resources.h"
#include "components/url_formatter/elide_url.h"
#include "grit/theme_resources.h"
@@ -123,12 +124,12 @@ GURL PermissionRequestImpl::GetOrigin() const {
void PermissionRequestImpl::PermissionGranted() {
RegisterActionTaken();
- permission_decided_callback_.Run(true, CONTENT_SETTING_ALLOW);
+ permission_decided_callback_.Run(persist(), CONTENT_SETTING_ALLOW);
}
void PermissionRequestImpl::PermissionDenied() {
RegisterActionTaken();
- permission_decided_callback_.Run(true, CONTENT_SETTING_BLOCK);
+ permission_decided_callback_.Run(persist(), CONTENT_SETTING_BLOCK);
}
void PermissionRequestImpl::Cancelled() {
@@ -141,6 +142,15 @@ void PermissionRequestImpl::RequestFinished() {
delete_callback_.Run();
}
+bool PermissionRequestImpl::ShouldShowPersistenceToggle() const {
+ switch (permission_type_) {
raymes 2016/08/24 04:00:17 I think an if-statement is fine here
dominickn 2016/08/24 06:30:57 Done (made it the same as the infobar_delegate).
+ case content::PermissionType::GEOLOCATION:
+ return PermissionUtil::ShouldShowPersistenceToggle();
+ default:
+ return false;
+ }
+}
+
PermissionRequestType PermissionRequestImpl::GetPermissionRequestType()
const {
switch (permission_type_) {

Powered by Google App Engine
This is Rietveld 408576698