rename all references to default_button_index -> default_id to keep consistent with cancel_id
This commit is contained in:
parent
dfce803045
commit
ae5c6add11
7 changed files with 28 additions and 28 deletions
|
@ -72,7 +72,7 @@ void MapToCommonID(const std::vector<base::string16>& buttons,
|
|||
int ShowMessageBoxUTF16(HWND parent,
|
||||
MessageBoxType type,
|
||||
const std::vector<base::string16>& buttons,
|
||||
int default_button_index,
|
||||
int default_id,
|
||||
int cancel_id,
|
||||
int options,
|
||||
const base::string16& title,
|
||||
|
@ -157,7 +157,7 @@ void RunMessageBoxInNewThread(base::Thread* thread,
|
|||
NativeWindow* parent,
|
||||
MessageBoxType type,
|
||||
const std::vector<std::string>& buttons,
|
||||
int default_button_index,
|
||||
int default_id,
|
||||
int cancel_id,
|
||||
int options,
|
||||
const std::string& title,
|
||||
|
@ -165,7 +165,7 @@ void RunMessageBoxInNewThread(base::Thread* thread,
|
|||
const std::string& detail,
|
||||
const gfx::ImageSkia& icon,
|
||||
const MessageBoxCallback& callback) {
|
||||
int result = ShowMessageBox(parent, type, buttons, default_button_index,
|
||||
int result = ShowMessageBox(parent, type, buttons, default_id,
|
||||
cancel_id, options, title, message, detail, icon);
|
||||
content::BrowserThread::PostTask(
|
||||
content::BrowserThread::UI, FROM_HERE, base::Bind(callback, result));
|
||||
|
@ -178,7 +178,7 @@ void RunMessageBoxInNewThread(base::Thread* thread,
|
|||
int ShowMessageBox(NativeWindow* parent,
|
||||
MessageBoxType type,
|
||||
const std::vector<std::string>& buttons,
|
||||
int default_button_index,
|
||||
int default_id,
|
||||
int cancel_id,
|
||||
int options,
|
||||
const std::string& title,
|
||||
|
@ -197,7 +197,7 @@ int ShowMessageBox(NativeWindow* parent,
|
|||
return ShowMessageBoxUTF16(hwnd_parent,
|
||||
type,
|
||||
utf16_buttons,
|
||||
default_button_index,
|
||||
default_id,
|
||||
cancel_id,
|
||||
options,
|
||||
base::UTF8ToUTF16(title),
|
||||
|
@ -209,7 +209,7 @@ int ShowMessageBox(NativeWindow* parent,
|
|||
void ShowMessageBox(NativeWindow* parent,
|
||||
MessageBoxType type,
|
||||
const std::vector<std::string>& buttons,
|
||||
int default_button_index,
|
||||
int default_id,
|
||||
int cancel_id,
|
||||
int options,
|
||||
const std::string& title,
|
||||
|
@ -229,7 +229,7 @@ void ShowMessageBox(NativeWindow* parent,
|
|||
unretained->message_loop()->PostTask(
|
||||
FROM_HERE,
|
||||
base::Bind(&RunMessageBoxInNewThread, base::Unretained(unretained),
|
||||
parent, type, buttons, default_button_index,
|
||||
parent, type, buttons, default_id,
|
||||
cancel_id, options, title, message, detail, icon, callback));
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue