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

2 files changed, 12 insertions, 13 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();
diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h
index c8b721dc..85388bd 100644
--- a/chrome/browser/views/infobars/infobars.h
+++ b/chrome/browser/views/infobars/infobars.h
@@ -8,16 +8,16 @@
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/common/animation.h"
 #include "chrome/views/controls/button/button.h"
-#include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/controls/link.h"
 
 class InfoBarContainer;
 class SlideAnimation;
 namespace views {
-class ImageButton;
 class ExternalFocusTracker;
+class ImageButton;
 class ImageView;
 class Label;
+class NativeButton;
 }
 
 // This file contains implementations for some general purpose InfoBars. See
@@ -70,10 +70,10 @@ class InfoBar : public views::View,
   // (Will lead to this InfoBar being closed).
   void RemoveInfoBar() const;
 
- private:
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender);
 
+ private:
   // Overridden from AnimationDelegate:
   virtual void AnimationProgressed(const Animation* animation);
   virtual void AnimationEnded(const Animation* animation);
@@ -158,8 +158,7 @@ class LinkInfoBar : public InfoBar,
   DISALLOW_COPY_AND_ASSIGN(LinkInfoBar);
 };
 
-class ConfirmInfoBar : public AlertInfoBar,
-                       public views::NativeButton::Listener {
+class ConfirmInfoBar : public AlertInfoBar {
  public:
   explicit ConfirmInfoBar(ConfirmInfoBarDelegate* delegate);
   virtual ~ConfirmInfoBar();
@@ -173,8 +172,8 @@ class ConfirmInfoBar : public AlertInfoBar,
                                     views::View* parent,
                                     views::View* child);
 
-  // Overridden from views::NativeButton::Listener:
-  virtual void ButtonPressed(views::NativeButton* sender);
+  // Overridden from views::ButtonListener:
+  virtual void ButtonPressed(views::Button* sender);
 
   // Overridden from InfoBar:
   virtual int GetAvailableWidth() const;