diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 21:55:52 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 21:55:52 +0000 |
| commit | a8111ce7343d3d6458eff4a5f370cf611f6753b4 (patch) | |
| tree | 30dfb0171c2e450f0271d3c787ac0cfbc06e663b /chrome/browser/views/infobars/infobars.cc | |
| parent | e48211e18675bec9056fb0762ec1c6644b0ff32e (diff) | |
| download | chromium_src-a8111ce7343d3d6458eff4a5f370cf611f6753b4.zip chromium_src-a8111ce7343d3d6458eff4a5f370cf611f6753b4.tar.gz chromium_src-a8111ce7343d3d6458eff4a5f370cf611f6753b4.tar.bz2 | |
The death knell for the old native buttons, checkboxes and radio buttons.
Replace with renamed NativeButton2, Checkbox2, RadioButton2.
Review URL: http://codereview.chromium.org/50083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/infobars/infobars.cc')
| -rw-r--r-- | chrome/browser/views/infobars/infobars.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index 52af060..91111e0 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -13,6 +13,7 @@ #include "chrome/common/slide_animation.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" +#include "chrome/views/controls/button/native_button.h" #include "chrome/views/controls/image_view.h" #include "chrome/views/controls/label.h" #include "chrome/views/focus/external_focus_tracker.h" @@ -372,11 +373,9 @@ ConfirmInfoBar::ConfirmInfoBar(ConfirmInfoBarDelegate* delegate) initialized_(false), AlertInfoBar(delegate) { ok_button_ = new views::NativeButton( - delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK)); - ok_button_->SetListener(this); + this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK)); cancel_button_ = new views::NativeButton( - delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL)); - cancel_button_->SetListener(this); + this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL)); } ConfirmInfoBar::~ConfirmInfoBar() { @@ -422,9 +421,10 @@ void ConfirmInfoBar::ViewHierarchyChanged(bool is_add, } } -// ConfirmInfoBar, views::NativeButton::Listener implementation: --------------- +// ConfirmInfoBar, views::ButtonListener implementation: --------------- -void ConfirmInfoBar::ButtonPressed(views::NativeButton* sender) { +void ConfirmInfoBar::ButtonPressed(views::Button* sender) { + InfoBar::ButtonPressed(sender); if (sender == ok_button_) { if (GetDelegate()->Accept()) RemoveInfoBar(); |