| Index: ui/views/window/dialog_client_view.cc
|
| diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
|
| index 5b5db8b88a4ca586a446d74ad93a0a0006e5981f..62a800c138bb519c60bbd6fe74e8c2e4201fae1c 100644
|
| --- a/ui/views/window/dialog_client_view.cc
|
| +++ b/ui/views/window/dialog_client_view.cc
|
| @@ -95,7 +95,7 @@ void DialogClientView::UpdateDialogButtons() {
|
| AddChildView(ok_button_);
|
| }
|
|
|
| - UpdateButton(ok_button_, ui::DIALOG_BUTTON_OK);
|
| + GetDialogDelegate()->UpdateButton(ok_button_, ui::DIALOG_BUTTON_OK);
|
| } else if (ok_button_) {
|
| delete ok_button_;
|
| ok_button_ = NULL;
|
| @@ -107,7 +107,7 @@ void DialogClientView::UpdateDialogButtons() {
|
| AddChildView(cancel_button_);
|
| }
|
|
|
| - UpdateButton(cancel_button_, ui::DIALOG_BUTTON_CANCEL);
|
| + GetDialogDelegate()->UpdateButton(cancel_button_, ui::DIALOG_BUTTON_CANCEL);
|
| } else if (cancel_button_) {
|
| delete cancel_button_;
|
| cancel_button_ = NULL;
|
| @@ -320,14 +320,6 @@ LabelButton* DialogClientView::CreateDialogButton(ui::DialogButton type) {
|
| return button;
|
| }
|
|
|
| -void DialogClientView::UpdateButton(LabelButton* button,
|
| - ui::DialogButton type) {
|
| - DialogDelegate* dialog = GetDialogDelegate();
|
| - button->SetText(dialog->GetDialogButtonLabel(type));
|
| - button->SetEnabled(dialog->IsDialogButtonEnabled(type));
|
| - button->SetIsDefault(type == dialog->GetDefaultDialogButton());
|
| -}
|
| -
|
| int DialogClientView::GetButtonsAndExtraViewRowHeight() const {
|
| int extra_view_height = ShouldShow(extra_view_) ?
|
| extra_view_->GetPreferredSize().height() : 0;
|
|
|