diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 23:25:13 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 23:25:13 +0000 |
| commit | 48c8fa63122510b2c51c6608a93b30e94192e679 (patch) | |
| tree | dc22b80b2f4103d865cbfe47c6f4dc52c8595985 /chrome/browser/views/infobars/infobars.cc | |
| parent | 9ea0ea99d3a1140a17712a286414d387eddbe8ac (diff) | |
| download | chromium_src-48c8fa63122510b2c51c6608a93b30e94192e679.zip chromium_src-48c8fa63122510b2c51c6608a93b30e94192e679.tar.gz chromium_src-48c8fa63122510b2c51c6608a93b30e94192e679.tar.bz2 | |
Rework the Button API to be saner in preparation for NativeControl rejiggering.BaseButton->Button, CustomButtonButton->ImageButtonToggleButton->ToggleImageButtonRemoving SetListener (buttons take listener through ctor)Tidy up source files. No functionality changes, just naming and organization.Look at the button classes first, then everything else.
Review URL: http://codereview.chromium.org/46096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/infobars/infobars.cc')
| -rw-r--r-- | chrome/browser/views/infobars/infobars.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index de1401f..4c4e621 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -12,7 +12,7 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/slide_animation.h" #include "chrome/views/background.h" -#include "chrome/views/button.h" +#include "chrome/views/image_button.h" #include "chrome/views/external_focus_tracker.h" #include "chrome/views/image_view.h" #include "chrome/views/label.h" @@ -71,7 +71,7 @@ class InfoBarBackground : public views::Background { InfoBar::InfoBar(InfoBarDelegate* delegate) : delegate_(delegate), - close_button_(new views::Button), + close_button_(new views::ImageButton(this)), delete_factory_(this) { // We delete ourselves when we're removed from the view hierarchy. SetParentOwned(false); @@ -79,13 +79,12 @@ InfoBar::InfoBar(InfoBarDelegate* delegate) set_background(new InfoBarBackground); ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - close_button_->SetImage(views::Button::BS_NORMAL, + close_button_->SetImage(views::CustomButton::BS_NORMAL, rb.GetBitmapNamed(IDR_CLOSE_BAR)); - close_button_->SetImage(views::Button::BS_HOT, + close_button_->SetImage(views::CustomButton::BS_HOT, rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); - close_button_->SetImage(views::Button::BS_PUSHED, + close_button_->SetImage(views::CustomButton::BS_PUSHED, rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); - close_button_->SetListener(this, 0); close_button_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_CLOSE)); AddChildView(close_button_); @@ -157,9 +156,9 @@ void InfoBar::RemoveInfoBar() const { container_->RemoveDelegate(delegate()); } -// InfoBar, views::BaseButton::ButtonListener implementation: ------------------ +// InfoBar, views::ButtonListener implementation: ------------------ -void InfoBar::ButtonPressed(views::BaseButton* sender) { +void InfoBar::ButtonPressed(views::Button* sender) { if (sender == close_button_) RemoveInfoBar(); } |