Add cancelId option for showMessageBox
This commit is contained in:
parent
083d0b8b60
commit
b158427271
6 changed files with 27 additions and 10 deletions
|
@ -43,6 +43,7 @@ class MessageDialog : public views::WidgetDelegate,
|
|||
MessageDialog(NativeWindow* parent_window,
|
||||
MessageBoxType type,
|
||||
const std::vector<std::string>& buttons,
|
||||
int cancel_id,
|
||||
const std::string& title,
|
||||
const std::string& message,
|
||||
const std::string& detail,
|
||||
|
@ -85,6 +86,7 @@ class MessageDialog : public views::WidgetDelegate,
|
|||
gfx::ImageSkia icon_;
|
||||
|
||||
bool delete_on_close_;
|
||||
int cancel_id_;
|
||||
int result_;
|
||||
base::string16 title_;
|
||||
|
||||
|
@ -125,12 +127,14 @@ class MessageDialogClientView : public views::ClientView {
|
|||
MessageDialog::MessageDialog(NativeWindow* parent_window,
|
||||
MessageBoxType type,
|
||||
const std::vector<std::string>& buttons,
|
||||
int cancel_id,
|
||||
const std::string& title,
|
||||
const std::string& message,
|
||||
const std::string& detail,
|
||||
const gfx::ImageSkia& icon)
|
||||
: icon_(icon),
|
||||
delete_on_close_(false),
|
||||
cancel_id_(cancel_id),
|
||||
result_(-1),
|
||||
title_(base::UTF8ToUTF16(title)),
|
||||
parent_(parent_window),
|
||||
|
@ -211,7 +215,7 @@ int MessageDialog::GetResult() const {
|
|||
return i;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return cancel_id_;
|
||||
} else {
|
||||
return result_;
|
||||
}
|
||||
|
@ -337,12 +341,13 @@ void MessageDialog::ButtonPressed(views::Button* sender,
|
|||
int ShowMessageBox(NativeWindow* parent_window,
|
||||
MessageBoxType type,
|
||||
const std::vector<std::string>& buttons,
|
||||
int cancel_id,
|
||||
const std::string& title,
|
||||
const std::string& message,
|
||||
const std::string& detail,
|
||||
const gfx::ImageSkia& icon) {
|
||||
MessageDialog dialog(
|
||||
parent_window, type, buttons, title, message, detail, icon);
|
||||
parent_window, type, buttons, cancel_id, title, message, detail, icon);
|
||||
{
|
||||
base::MessageLoop::ScopedNestableTaskAllower allow(
|
||||
base::MessageLoopForUI::current());
|
||||
|
@ -357,6 +362,7 @@ int ShowMessageBox(NativeWindow* parent_window,
|
|||
void ShowMessageBox(NativeWindow* parent_window,
|
||||
MessageBoxType type,
|
||||
const std::vector<std::string>& buttons,
|
||||
int cancel_id,
|
||||
const std::string& title,
|
||||
const std::string& message,
|
||||
const std::string& detail,
|
||||
|
@ -364,7 +370,7 @@ void ShowMessageBox(NativeWindow* parent_window,
|
|||
const MessageBoxCallback& callback) {
|
||||
// The dialog would be deleted when the dialog is closed.
|
||||
MessageDialog* dialog = new MessageDialog(
|
||||
parent_window, type, buttons, title, message, detail, icon);
|
||||
parent_window, type, buttons, cancel_id, title, message, detail, icon);
|
||||
dialog->set_callback(callback);
|
||||
dialog->Show();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue