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

Unified Diff: chrome/browser/safe_browsing/srt_global_error_win.cc

Issue 1903733005: Make sure to not remove global error twice. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR Comments 1 Created 4 years, 8 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
« no previous file with comments | « chrome/browser/safe_browsing/srt_global_error_win.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/srt_global_error_win.cc
diff --git a/chrome/browser/safe_browsing/srt_global_error_win.cc b/chrome/browser/safe_browsing/srt_global_error_win.cc
index 69f4062600cade8627f35428842f7f5040d31a75..81732f0da9143f0d745938cb927ac4367fb7270d 100644
--- a/chrome/browser/safe_browsing/srt_global_error_win.cc
+++ b/chrome/browser/safe_browsing/srt_global_error_win.cc
@@ -14,7 +14,6 @@
#include "base/thread_task_runner_handle.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/safe_browsing/srt_field_trial_win.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/global_error/global_error_service.h"
@@ -55,7 +54,7 @@ void MaybeExecuteSRTFromBlockingPool(
if (base::PathExists(downloaded_path)) {
base::FilePath executable_path(
downloaded_path.ReplaceExtension(kExecutableExtension));
- if (base::ReplaceFile(downloaded_path, executable_path, NULL)) {
+ if (base::ReplaceFile(downloaded_path, executable_path, nullptr)) {
base::CommandLine srt_command_line(executable_path);
srt_command_line.AppendSwitch(kChromePromptSwitch);
base::Process srt_process(
@@ -158,17 +157,12 @@ void SRTGlobalError::OnBubbleViewDidClose(Browser* browser) {
}
void SRTGlobalError::BubbleViewAcceptButtonPressed(Browser* browser) {
- RecordSRTPromptHistogram(SRT_PROMPT_ACCEPTED);
- interacted_ = true;
- global_error_service_->RemoveGlobalError(this);
+ OnUserinteractionStarted(SRT_PROMPT_ACCEPTED);
MaybeExecuteSRT();
}
void SRTGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
- RecordSRTPromptHistogram(SRT_PROMPT_DENIED);
- interacted_ = true;
- global_error_service_->RemoveGlobalError(this);
-
+ OnUserinteractionStarted(SRT_PROMPT_DENIED);
BrowserThread::PostBlockingPoolTask(
FROM_HERE, base::Bind(&DeleteFilesFromBlockingPool, downloaded_path_));
OnUserinteractionDone();
@@ -210,6 +204,20 @@ void SRTGlobalError::FallbackToDownloadPage() {
OnUserinteractionDone();
}
+void SRTGlobalError::OnUserinteractionStarted(
+ SRTPromptHistogramValue histogram_value) {
+ // This is for cases where the UI doesn't go away quickly enough and user
+ // might click on the button more than once, or more than one button.
+ if (interacted_)
+ return;
+ RecordSRTPromptHistogram(histogram_value);
+ interacted_ = true;
+ if (global_error_service_) {
+ global_error_service_->RemoveGlobalError(this);
+ global_error_service_ = nullptr;
+ }
+}
+
void SRTGlobalError::OnUserinteractionDone() {
DCHECK(interacted_);
// Once the user interacted with the bubble, we can forget about any pending
« no previous file with comments | « chrome/browser/safe_browsing/srt_global_error_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698