Skip to content

GitLab

T
tangled
Commit c4b2c0cb authored by Friedrich Horschig's avatar Friedrich Horschig Committed by Commit Bot
Browse files
Options

Revert "Fix the JS dialog dismissal cause" 

This reverts commit a84f590c.

Reason for revert: the introduced test JavaScriptDialogTest.DismissalCausePromptTabClosedByUser fails more often than it passes (e.g. https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Mac10.13%20Tests%20%28dbg%29/4745)
This test seems to be fairly essential given that this CL mainly affects the log. If it's not, feel free to disable on Mac and reland.

Original change's description:
> Fix the JS dialog dismissal cause
> 
> Previously on a non-Mac platform when JS dialog is dismissed by user
> closing the tab, |DIALOG_BUTTON_CLICKED| is logged. This change
> separates the case of the user replying to the dialog with the buttons
> vs rejecting it.
> 
> Bug: 872795
> Change-Id: I4b8781daeb3cead5ee4e975a67f79f94b7fa84e5
> Reviewed-on: https://chromium-review.googlesource.com/1164647
> Reviewed-by: Charlie Harrison <csharrison@chromium.org>
> Reviewed-by: Avi Drissman <avi@chromium.org>
> Commit-Queue: Yao Xiao <yaoxia@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#583885}

TBR=avi@chromium.org,csharrison@chromium.org,huayinz@chromium.org,yaoxia@chromium.org

Change-Id: I0de2f8e0ded623c121325a80975d131681aaa493
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 872795
Reviewed-on: https://chromium-review.googlesource.com/1179701Reviewed-by: default avatarFriedrich Horschig <fhorschig@chromium.org>
Commit-Queue: Friedrich Horschig <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584004}
parent 045b8f9d
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 261 deletions
chrome/browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc
View file @ c4b2c0cb
......@@ -4,11 +4,8 @@
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_command_line.h"
#include "build/build_config.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_switches.h"
......@@ -18,12 +15,7 @@
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_utils.h"
using DismissalCause = JavaScriptDialogTabHelper::DismissalCause;
class JavaScriptDialogTest : public InProcessBrowserTest {
private:
friend class JavaScriptDialogDismissalCauseTester;
};
using JavaScriptDialogTest = InProcessBrowserTest;
IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest, ReloadDoesntHang) {
content::WebContents* tab =
......@@ -199,144 +191,3 @@ IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest, HandleJavaScriptDialog) {
ASSERT_TRUE(callback_helper.last_success());
ASSERT_EQ(value1, callback_helper.last_input());
}
class JavaScriptDialogDismissalCauseTester {
public:
explicit JavaScriptDialogDismissalCauseTester(JavaScriptDialogTest* test)
: tab_(test->browser()->tab_strip_model()->GetActiveWebContents()),
frame_(tab_->GetMainFrame()),
js_helper_(JavaScriptDialogTabHelper::FromWebContents(tab_)) {}
void PopupDialog(content::JavaScriptDialogType type) {
bool did_suppress = false;
js_helper_->RunJavaScriptDialog(
tab_, frame_, type, base::ASCIIToUTF16("Label"),
base::ASCIIToUTF16("abc"), {}, &did_suppress);
}
void ClickDialogButton(bool accept, const base::string16& user_input) {
EXPECT_TRUE(js_helper_->IsShowingDialogForTesting());
js_helper_->ClickDialogButtonForTesting(accept, user_input);
}
void Reload() {
tab_->GetController().Reload(content::ReloadType::NORMAL, false);
content::WaitForLoadStop(tab_);
}
void CallHandleDialog(bool accept, const base::string16* prompt_override) {
EXPECT_TRUE(js_helper_->IsShowingDialogForTesting());
js_helper_->HandleJavaScriptDialog(tab_, accept, prompt_override);
}
void CallCancelDialogs(bool reset_state) {
EXPECT_TRUE(js_helper_->IsShowingDialogForTesting());
js_helper_->CancelDialogs(tab_, reset_state);
}
private:
content::WebContents* tab_;
content::RenderFrameHost* frame_;
JavaScriptDialogTabHelper* js_helper_;
};
IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest, DismissalCausePromptAcceptButton) {
base::HistogramTester histogram_tester;
JavaScriptDialogDismissalCauseTester tester(this);
tester.PopupDialog(content::JAVASCRIPT_DIALOG_TYPE_PROMPT);
tester.ClickDialogButton(true, base::string16());
histogram_tester.ExpectUniqueSample("JSDialogs.DismissalCause.Prompt",
DismissalCause::kDialogButtonClicked, 1);
}
IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest, DismissalCausePromptCancelButton) {
base::HistogramTester histogram_tester;
JavaScriptDialogDismissalCauseTester tester(this);
tester.PopupDialog(content::JAVASCRIPT_DIALOG_TYPE_PROMPT);
tester.ClickDialogButton(false, base::string16());
histogram_tester.ExpectUniqueSample("JSDialogs.DismissalCause.Prompt",
DismissalCause::kDialogButtonClicked, 1);
}
IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest, DismissalCausePromptHandleDialog) {
base::HistogramTester histogram_tester;
JavaScriptDialogDismissalCauseTester tester(this);
tester.PopupDialog(content::JAVASCRIPT_DIALOG_TYPE_PROMPT);
tester.CallHandleDialog(true, nullptr);
histogram_tester.ExpectUniqueSample("JSDialogs.DismissalCause.Prompt",
DismissalCause::kHandleDialogCalled, 1);
}
IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest,
DismissalCausePromptCancelDialogs) {
base::HistogramTester histogram_tester;
JavaScriptDialogDismissalCauseTester tester(this);
tester.PopupDialog(content::JAVASCRIPT_DIALOG_TYPE_PROMPT);
tester.CallCancelDialogs(false);
histogram_tester.ExpectUniqueSample("JSDialogs.DismissalCause.Prompt",
DismissalCause::kCancelDialogsCalled, 1);
}
IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest,
DismissalCausePromptTabClosedByUser) {
base::HistogramTester histogram_tester;
JavaScriptDialogDismissalCauseTester tester(this);
tester.PopupDialog(content::JAVASCRIPT_DIALOG_TYPE_PROMPT);
chrome::CloseTab(browser());
// There are differences in the implementations of Views on different platforms
// that cause different dismissal causes.
#if defined(OS_MACOSX)
histogram_tester.ExpectUniqueSample("JSDialogs.DismissalCause.Prompt",
DismissalCause::kCancelDialogsCalled, 1);
#else
histogram_tester.ExpectUniqueSample("JSDialogs.DismissalCause.Prompt",
DismissalCause::kDialogClosed, 1);
#endif
}
IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest, DismissalCausePromptTabHidden) {
base::HistogramTester histogram_tester;
JavaScriptDialogDismissalCauseTester tester(this);
tester.PopupDialog(content::JAVASCRIPT_DIALOG_TYPE_PROMPT);
chrome::NewTab(browser());
histogram_tester.ExpectUniqueSample("JSDialogs.DismissalCause.Prompt",
DismissalCause::kTabHidden, 1);
}
IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest,
DismissalCausePromptBrowserSwitched) {
base::HistogramTester histogram_tester;
JavaScriptDialogDismissalCauseTester tester(this);
tester.PopupDialog(content::JAVASCRIPT_DIALOG_TYPE_PROMPT);
chrome::NewEmptyWindow(browser()->profile());
histogram_tester.ExpectUniqueSample("JSDialogs.DismissalCause.Prompt",
DismissalCause::kBrowserSwitched, 1);
}
IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest, DismissalCausePromptTabNavigated) {
base::HistogramTester histogram_tester;
JavaScriptDialogDismissalCauseTester tester(this);
tester.PopupDialog(content::JAVASCRIPT_DIALOG_TYPE_PROMPT);
tester.Reload();
histogram_tester.ExpectUniqueSample("JSDialogs.DismissalCause.Prompt",
DismissalCause::kTabNavigated, 1);
}
IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest,
DismissalCausePromptSubsequentDialogShown) {
base::HistogramTester histogram_tester;
JavaScriptDialogDismissalCauseTester tester(this);
tester.PopupDialog(content::JAVASCRIPT_DIALOG_TYPE_PROMPT);
tester.PopupDialog(content::JAVASCRIPT_DIALOG_TYPE_ALERT);
histogram_tester.ExpectUniqueSample("JSDialogs.DismissalCause.Prompt",
DismissalCause::kSubsequentDialogShown,
1);
}
IN_PROC_BROWSER_TEST_F(JavaScriptDialogTest, NoDismissalAlertTabHidden) {
base::HistogramTester histogram_tester;
JavaScriptDialogDismissalCauseTester tester(this);
tester.PopupDialog(content::JAVASCRIPT_DIALOG_TYPE_ALERT);
chrome::NewTab(browser());
histogram_tester.ExpectTotalCount("JSDialogs.DismissalCause.Alert", 0);
}
chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.cc
View file @ c4b2c0cb
......@@ -134,8 +134,7 @@ base::WeakPtr<JavaScriptDialog> CreateNewDialog(
content::JavaScriptDialogType dialog_type,
const base::string16& message_text,
const base::string16& default_prompt_text,
content::JavaScriptDialogManager::DialogClosedCallback dialog_callback,
base::OnceClosure dialog_closed_callback) {
content::JavaScriptDialogManager::DialogClosedCallback dialog_callback) {
#if defined(OS_ANDROID)
return JavaScriptDialogAndroid::Create(
parent_web_contents, alerting_web_contents, title, dialog_type,
......@@ -143,13 +142,27 @@ base::WeakPtr<JavaScriptDialog> CreateNewDialog(
#else
return JavaScriptDialogViews::Create(
parent_web_contents, alerting_web_contents, title, dialog_type,
message_text, default_prompt_text, std::move(dialog_callback),
std::move(dialog_closed_callback));
message_text, default_prompt_text, std::move(dialog_callback));
#endif
}
} // namespace
enum class JavaScriptDialogTabHelper::DismissalCause {
// This is used for a UMA histogram. Please never alter existing values, only
// append new ones.
TAB_HELPER_DESTROYED = 0,
SUBSEQUENT_DIALOG_SHOWN = 1,
HANDLE_DIALOG_CALLED = 2,
CANCEL_DIALOGS_CALLED = 3,
TAB_HIDDEN = 4,
BROWSER_SWITCHED = 5,
DIALOG_BUTTON_CLICKED = 6,
TAB_NAVIGATED = 7,
TAB_SWITCHED_OUT = 8,
COUNT,
};
JavaScriptDialogTabHelper::JavaScriptDialogTabHelper(
content::WebContents* web_contents)
: content::WebContentsObserver(web_contents) {
......@@ -159,7 +172,7 @@ JavaScriptDialogTabHelper::~JavaScriptDialogTabHelper() {
#if !defined(OS_ANDROID)
DCHECK(!tab_strip_model_being_observed_);
#endif
CloseDialog(DismissalCause::kTabHelperDestroyed, false, base::string16());
CloseDialog(DismissalCause::TAB_HELPER_DESTROYED, false, base::string16());
}
void JavaScriptDialogTabHelper::SetDialogShownCallbackForTesting(
......@@ -171,13 +184,6 @@ bool JavaScriptDialogTabHelper::IsShowingDialogForTesting() const {
return !!dialog_;
}
void JavaScriptDialogTabHelper::ClickDialogButtonForTesting(
bool accept,
const base::string16& user_input) {
DCHECK(!!dialog_);
CloseDialog(DismissalCause::kDialogButtonClicked, accept, user_input);
}
void JavaScriptDialogTabHelper::RunJavaScriptDialog(
content::WebContents* alerting_web_contents,
content::RenderFrameHost* render_frame_host,
......@@ -226,7 +232,7 @@ void JavaScriptDialogTabHelper::RunJavaScriptDialog(
}
// Close any dialog already showing.
CloseDialog(DismissalCause::kSubsequentDialogShown, false, base::string16());
CloseDialog(DismissalCause::SUBSEQUENT_DIALOG_SHOWN, false, base::string16());
bool make_pending = false;
if (!IsWebContentsForemost(parent_web_contents) &&
......@@ -294,10 +300,7 @@ void JavaScriptDialogTabHelper::RunJavaScriptDialog(
dialog_type, truncated_message_text, truncated_default_prompt_text,
base::BindOnce(&JavaScriptDialogTabHelper::CloseDialog,
base::Unretained(this),
DismissalCause::kDialogButtonClicked),
base::BindOnce(&JavaScriptDialogTabHelper::CloseDialog,
base::Unretained(this), DismissalCause::kDialogClosed,
false, base::string16()));
DismissalCause::DIALOG_BUTTON_CLICKED));
} else {
DCHECK(!pending_dialog_);
dialog_ = CreateNewDialog(
......@@ -305,10 +308,7 @@ void JavaScriptDialogTabHelper::RunJavaScriptDialog(
truncated_message_text, truncated_default_prompt_text,
base::BindOnce(&JavaScriptDialogTabHelper::CloseDialog,
base::Unretained(this),
DismissalCause::kDialogButtonClicked),
base::BindOnce(&JavaScriptDialogTabHelper::CloseDialog,
base::Unretained(this), DismissalCause::kDialogClosed,
false, base::string16()));
DismissalCause::DIALOG_BUTTON_CLICKED));
}
#if !defined(OS_ANDROID)
......@@ -370,7 +370,7 @@ bool JavaScriptDialogTabHelper::HandleJavaScriptDialog(
bool accept,
const base::string16* prompt_override) {
if (dialog_ || pending_dialog_) {
CloseDialog(DismissalCause::kHandleDialogCalled, accept,
CloseDialog(DismissalCause::HANDLE_DIALOG_CALLED, accept,
prompt_override ? *prompt_override : dialog_->GetUserInput());
return true;
}
......@@ -383,7 +383,7 @@ bool JavaScriptDialogTabHelper::HandleJavaScriptDialog(
void JavaScriptDialogTabHelper::CancelDialogs(
content::WebContents* web_contents,
bool reset_state) {
CloseDialog(DismissalCause::kCancelDialogsCalled, false, base::string16());
CloseDialog(DismissalCause::CANCEL_DIALOGS_CALLED, false, base::string16());
// Cancel any app-modal dialogs being run by the app-modal dialog system.
return AppModalDialogManager()->CancelDialogs(web_contents, reset_state);
......@@ -392,7 +392,7 @@ void JavaScriptDialogTabHelper::CancelDialogs(
void JavaScriptDialogTabHelper::OnVisibilityChanged(
content::Visibility visibility) {
if (visibility == content::Visibility::HIDDEN) {
HandleTabSwitchAway(DismissalCause::kTabHidden);
HandleTabSwitchAway(DismissalCause::TAB_HIDDEN);
} else if (pending_dialog_) {
dialog_ = std::move(pending_dialog_).Run();
pending_dialog_.Reset();
......@@ -408,7 +408,7 @@ void JavaScriptDialogTabHelper::DidStartNavigation(
content::NavigationHandle* navigation_handle) {
// Close the dialog if the user started a new navigation. This allows reloads
// and history navigations to proceed.
CloseDialog(DismissalCause::kTabNavigated, false, base::string16());
CloseDialog(DismissalCause::TAB_NAVIGATED, false, base::string16());
}
// This function handles the case where browser-side navigation (PlzNavigate) is
......@@ -420,7 +420,7 @@ void JavaScriptDialogTabHelper::DidStartNavigationToPendingEntry(
content::ReloadType reload_type) {
// Close the dialog if the user started a new navigation. This allows reloads
// and history navigations to proceed.
CloseDialog(DismissalCause::kTabNavigated, false, base::string16());
CloseDialog(DismissalCause::TAB_NAVIGATED, false, base::string16());
}
#if !defined(OS_ANDROID)
......@@ -428,7 +428,7 @@ void JavaScriptDialogTabHelper::OnBrowserSetLastActive(Browser* browser) {
if (IsWebContentsForemost(web_contents())) {
OnVisibilityChanged(content::Visibility::VISIBLE);
} else {
HandleTabSwitchAway(DismissalCause::kBrowserSwitched);
HandleTabSwitchAway(DismissalCause::BROWSER_SWITCHED);
}
}
......@@ -443,7 +443,7 @@ void JavaScriptDialogTabHelper::TabReplacedAt(
// must be done here.
SetTabNeedsAttentionImpl(false, tab_strip_model, index);
CloseDialog(DismissalCause::kTabSwitchedOut, false, base::string16());
CloseDialog(DismissalCause::TAB_SWITCHED_OUT, false, base::string16());
}
}
......@@ -461,23 +461,29 @@ void JavaScriptDialogTabHelper::TabDetachedAt(content::WebContents* contents,
DCHECK(tab_strip_model_being_observed_);
tab_strip_model_being_observed_->RemoveObserver(this);
tab_strip_model_being_observed_ = nullptr;
CloseDialog(DismissalCause::kTabHelperDestroyed, false, base::string16());
CloseDialog(DismissalCause::TAB_HELPER_DESTROYED, false, base::string16());
}
}
#endif
void JavaScriptDialogTabHelper::LogDialogDismissalCause(DismissalCause cause) {
// Log to UMA
void JavaScriptDialogTabHelper::LogDialogDismissalCause(
JavaScriptDialogTabHelper::DismissalCause cause) {
switch (dialog_type_) {
case content::JAVASCRIPT_DIALOG_TYPE_ALERT:
UMA_HISTOGRAM_ENUMERATION("JSDialogs.DismissalCause.Alert", cause);
UMA_HISTOGRAM_ENUMERATION("JSDialogs.DismissalCause.Alert",
static_cast<int>(cause),
static_cast<int>(DismissalCause::COUNT));
break;
case content::JAVASCRIPT_DIALOG_TYPE_CONFIRM:
UMA_HISTOGRAM_ENUMERATION("JSDialogs.DismissalCause.Confirm", cause);
UMA_HISTOGRAM_ENUMERATION("JSDialogs.DismissalCause.Confirm",
static_cast<int>(cause),
static_cast<int>(DismissalCause::COUNT));
break;
case content::JAVASCRIPT_DIALOG_TYPE_PROMPT:
UMA_HISTOGRAM_ENUMERATION("JSDialogs.DismissalCause.Prompt", cause);
UMA_HISTOGRAM_ENUMERATION("JSDialogs.DismissalCause.Prompt",
static_cast<int>(cause),
static_cast<int>(DismissalCause::COUNT));
break;
}
}
......@@ -516,8 +522,7 @@ void JavaScriptDialogTabHelper::CloseDialog(DismissalCause cause,
//
// Using the |cause| to distinguish a call from JavaScriptDialog vs from
// within JavaScriptDialogTabHelper is a bit hacky, but is the simplest way.
if (dialog_ && cause != DismissalCause::kDialogButtonClicked &&
cause != DismissalCause::kDialogClosed)
if (dialog_ && cause != DismissalCause::DIALOG_BUTTON_CLICKED)
dialog_->CloseDialogWithoutCallback();
// If there is a callback, call it. There might not be one, if a tab-modal
......@@ -529,8 +534,8 @@ void JavaScriptDialogTabHelper::CloseDialog(DismissalCause cause,
// state; clear it out. However, if the tab was switched out, the turning off
// of the "needs attention" state was done in TabReplacedAt() or
// TabDetachedAt() because SetTabNeedsAttention won't work, so don't call it.
if (pending_dialog_ && cause != DismissalCause::kTabSwitchedOut &&
cause != DismissalCause::kTabHelperDestroyed) {
if (pending_dialog_ && cause != DismissalCause::TAB_SWITCHED_OUT &&
cause != DismissalCause::TAB_HELPER_DESTROYED) {
SetTabNeedsAttention(false);
}
......
chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h
View file @ c4b2c0cb
......@@ -48,61 +48,11 @@ class JavaScriptDialogTabHelper
#endif
public content::WebContentsUserData<JavaScriptDialogTabHelper> {
public:
enum class DismissalCause {
// This is used for a UMA histogram. Please never alter existing values,
// only append new ones.
// The tab helper is destroyed. By current design, the dialog is always torn
// down before the tab helper is destroyed, so we never see the
// |kTabHelperDestroyed| enum. However, that might not always be the case.
// It's better to have a simple rule in the code of "when you close a dialog
// you must provide a UMA enum reason why" and have some enums that never
// happen than have haphazard code that enforces no rules.
kTabHelperDestroyed = 0,
// Subsequent dialog pops up.
kSubsequentDialogShown = 1,
// HandleJavaScriptDialog() is called. In practice, this can happen whenever
// browser choose to accept/cancel the dialog without user's interaction.
kHandleDialogCalled = 2,
// CancelDialogs() is called. In practice, this can happen whenever browser
// choose to close the dialog without user's interaction. Besides, this can
// also happen when tab is closed by user on a Mac platform.
kCancelDialogsCalled = 3,
// Tab is made hidden by opening a new tab, switching to another tab, etc.
// Note that only Prompt() and Confirm() can be dismissed for this cause;
// it won't affect Alert().
kTabHidden = 4,
// Another browser instance is made active.
kBrowserSwitched = 5,
// Accept/Cancel button is clicked by user.
kDialogButtonClicked = 6,
// Navigation occurs.
kTabNavigated = 7,
// TabReplacedAt() is called.
kTabSwitchedOut = 8,
// CloseDialog() is called. In practice, this happens when tab is closed by
// user on a non-Mac platform.
kDialogClosed = 9,
kMaxValue = kDialogClosed,
};
explicit JavaScriptDialogTabHelper(content::WebContents* web_contents);
~JavaScriptDialogTabHelper() override;
void SetDialogShownCallbackForTesting(base::OnceClosure callback);
bool IsShowingDialogForTesting() const;
void ClickDialogButtonForTesting(bool accept,
const base::string16& user_input);
// JavaScriptDialogManager:
void RunJavaScriptDialog(content::WebContents* web_contents,
......@@ -146,6 +96,7 @@ class JavaScriptDialogTabHelper
private:
friend class content::WebContentsUserData<JavaScriptDialogTabHelper>;
enum class DismissalCause;
// Logs the cause of a dialog dismissal in UMA.
void LogDialogDismissalCause(DismissalCause cause);
......
chrome/browser/ui/javascript_dialogs/javascript_dialog_views.cc
View file @ c4b2c0cb
......@@ -19,18 +19,15 @@ base::WeakPtr<JavaScriptDialogViews> JavaScriptDialogViews::Create(
content::JavaScriptDialogType dialog_type,
const base::string16& message_text,
const base::string16& default_prompt_text,
content::JavaScriptDialogManager::DialogClosedCallback dialog_callback,
base::OnceClosure dialog_force_closed_callback) {
content::JavaScriptDialogManager::DialogClosedCallback dialog_callback) {
return (new JavaScriptDialogViews(
parent_web_contents, alerting_web_contents, title, dialog_type,
message_text, default_prompt_text, std::move(dialog_callback),
std::move(dialog_force_closed_callback)))
message_text, default_prompt_text, std::move(dialog_callback)))
->weak_factory_.GetWeakPtr();
}
void JavaScriptDialogViews::CloseDialogWithoutCallback() {
dialog_callback_.Reset();
dialog_force_closed_callback_.Reset();
GetWidget()->Close();
}
......@@ -64,8 +61,8 @@ bool JavaScriptDialogViews::Accept() {
}
bool JavaScriptDialogViews::Close() {
if (dialog_force_closed_callback_)
std::move(dialog_force_closed_callback_).Run();
if (dialog_callback_)
std::move(dialog_callback_).Run(false, base::string16());
return true;
}
......@@ -105,14 +102,12 @@ JavaScriptDialogViews::JavaScriptDialogViews(
content::JavaScriptDialogType dialog_type,
const base::string16& message_text,
const base::string16& default_prompt_text,
content::JavaScriptDialogManager::DialogClosedCallback dialog_callback,
base::OnceClosure dialog_force_closed_callback)
content::JavaScriptDialogManager::DialogClosedCallback dialog_callback)
: title_(title),
dialog_type_(dialog_type),
message_text_(message_text),
default_prompt_text_(default_prompt_text),
dialog_callback_(std::move(dialog_callback)),
dialog_force_closed_callback_(std::move(dialog_force_closed_callback)),
weak_factory_(this) {
int options = views::MessageBoxView::DETECT_DIRECTIONALITY;
if (dialog_type == content::JAVASCRIPT_DIALOG_TYPE_PROMPT)
......
chrome/browser/ui/javascript_dialogs/javascript_dialog_views.h
View file @ c4b2c0cb
......@@ -24,9 +24,6 @@ class JavaScriptDialogViews : public JavaScriptDialog,
public:
~JavaScriptDialogViews() override;
// Creates a new JS dialog. Note the two callbacks; |dialog_callback| is for
// user responses, while |dialog_force_closed_callback| is for when Views
// forces the dialog closed without a user reply.
static base::WeakPtr<JavaScriptDialogViews> Create(
content::WebContents* parent_web_contents,
content::WebContents* alerting_web_contents,
......@@ -34,8 +31,7 @@ class JavaScriptDialogViews : public JavaScriptDialog,
content::JavaScriptDialogType dialog_type,
const base::string16& message_text,
const base::string16& default_prompt_text,
content::JavaScriptDialogManager::DialogClosedCallback dialog_callback,
base::OnceClosure dialog_force_closed_callback);
content::JavaScriptDialogManager::DialogClosedCallback dialog_callback);
// JavaScriptDialog:
void CloseDialogWithoutCallback() override;
......@@ -66,15 +62,13 @@ class JavaScriptDialogViews : public JavaScriptDialog,
content::JavaScriptDialogType dialog_type,
const base::string16& message_text,
const base::string16& default_prompt_text,
content::JavaScriptDialogManager::DialogClosedCallback dialog_callback,
base::OnceClosure dialog_force_closed_callback);
content::JavaScriptDialogManager::DialogClosedCallback dialog_callback);
base::string16 title_;
content::JavaScriptDialogType dialog_type_;
base::string16 message_text_;
base::string16 default_prompt_text_;
content::JavaScriptDialogManager::DialogClosedCallback dialog_callback_;
base::OnceClosure dialog_force_closed_callback_;
// The message box view whose commands we handle.
views::MessageBoxView* message_box_view_;
......
tools/metrics/histograms/enums.xml
View file @ c4b2c0cb
......@@ -26069,11 +26069,6 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
The page displaying the dialog was switched out of its tab (e.g. tab
discarding)
</int>
<int value="9" label="Dialog closed">
The UI toolkit forced the dialog to close (at root caused by the user
closing the owning tab but going through a different path due to platform
differences)
</int>
</enum>
<enum name="JumplisticonsDeleteCategory">
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