| 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_) {
|
| + case content::PermissionType::GEOLOCATION:
|
| + return PermissionUtil::ShouldShowPersistenceToggle();
|
| + default:
|
| + return false;
|
| + }
|
| +}
|
| +
|
| PermissionRequestType PermissionRequestImpl::GetPermissionRequestType()
|
| const {
|
| switch (permission_type_) {
|
|
|