Commit b5a468af authored by Milica Selakovic's avatar Milica Selakovic Committed by Commit Bot

[PermissionRequestManager] Dismiss permission requests while Autobot is running

Permission prompts should be dismissed while Autobot is running, but prompt
should not be denied ir acceped. User should see prompt again and decide if
wants to allow or deny permission.

Bug: 1133783
Change-Id: I7665ffab65c1388c605a8f19f4ee5fc131063e4f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440759Reviewed-by: default avatarClemens Arbesser <arbesser@google.com>
Reviewed-by: default avatarBalazs Engedy <engedy@chromium.org>
Commit-Queue: Milica Selakovic <selakovic@google.com>
Cr-Commit-Position: refs/heads/master@{#812649}
parent 816a863b
...@@ -48,6 +48,7 @@ source_set("permissions") { ...@@ -48,6 +48,7 @@ source_set("permissions") {
] ]
deps = [ deps = [
"//base", "//base",
"//components/autofill_assistant/browser/public:public",
"//components/content_settings/browser", "//components/content_settings/browser",
"//components/content_settings/core/browser", "//components/content_settings/core/browser",
"//components/keyed_service/content", "//components/keyed_service/content",
......
include_rules = [ include_rules = [
"+components/autofill_assistant/browser/public",
"+components/content_settings/core", "+components/content_settings/core",
"+components/keyed_service/content", "+components/keyed_service/content",
"+components/keyed_service/core", "+components/keyed_service/core",
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/sequenced_task_runner_handle.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "components/autofill_assistant/browser/public/runtime_manager.h"
#include "components/permissions/features.h" #include "components/permissions/features.h"
#include "components/permissions/permission_decision_auto_blocker.h" #include "components/permissions/permission_decision_auto_blocker.h"
#include "components/permissions/permission_prompt.h" #include "components/permissions/permission_prompt.h"
...@@ -178,6 +179,16 @@ void PermissionRequestManager::AddRequest( ...@@ -178,6 +179,16 @@ void PermissionRequestManager::AddRequest(
return; return;
} }
// Cancel permission requests wile Autofill Assistant's UI is shown.
auto* assistant_runtime_manager =
autofill_assistant::RuntimeManager::GetForWebContents(web_contents());
if (assistant_runtime_manager && assistant_runtime_manager->GetState() ==
autofill_assistant::UIState::kShown) {
request->Cancelled();
request->RequestFinished();
return;
}
// Don't re-add an existing request or one with a duplicate text request. // Don't re-add an existing request or one with a duplicate text request.
PermissionRequest* existing_request = GetExistingRequest(request); PermissionRequest* existing_request = GetExistingRequest(request);
if (existing_request) { if (existing_request) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment