summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 18:48:15 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 18:48:15 +0000
commit8ef0b11afeb11f96028f3382a08447866a7687a4 (patch)
tree3823983aa7e09715fff0ef21aa7030da0dea92f3
parent1b7519aa10dcab1fc6bce1a639fc2ef55f4664d7 (diff)
downloadchromium_src-8ef0b11afeb11f96028f3382a08447866a7687a4.zip
chromium_src-8ef0b11afeb11f96028f3382a08447866a7687a4.tar.gz
chromium_src-8ef0b11afeb11f96028f3382a08447866a7687a4.tar.bz2
infobar: Use InfoBarTextButton instead of NativeButton's
BUG=none TEST=none Review URL: http://codereview.chromium.org/5977009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70913 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/infobars/infobars.cc19
-rw-r--r--chrome/browser/ui/views/infobars/infobars.h6
2 files changed, 10 insertions, 15 deletions
diff --git a/chrome/browser/ui/views/infobars/infobars.cc b/chrome/browser/ui/views/infobars/infobars.cc
index d1af02e..00504f0 100644
--- a/chrome/browser/ui/views/infobars/infobars.cc
+++ b/chrome/browser/ui/views/infobars/infobars.cc
@@ -10,6 +10,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/views/event_utils.h"
#include "chrome/browser/views/infobars/infobar_container.h"
+#include "chrome/browser/views/infobars/infobar_text_button.h"
#include "gfx/canvas.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
@@ -469,18 +470,12 @@ ConfirmInfoBar::ConfirmInfoBar(ConfirmInfoBarDelegate* delegate)
cancel_button_(NULL),
link_(NULL),
initialized_(false) {
- ok_button_ = new views::NativeButton(this,
- UTF16ToWideHack(delegate->GetButtonLabel(
- ConfirmInfoBarDelegate::BUTTON_OK)));
- ok_button_->SetAccessibleName(ok_button_->label());
- if (delegate->GetButtons() & ConfirmInfoBarDelegate::BUTTON_OK_DEFAULT)
- ok_button_->SetAppearsAsDefault(true);
- if (delegate->NeedElevation(ConfirmInfoBarDelegate::BUTTON_OK))
- ok_button_->SetNeedElevation(true);
- cancel_button_ = new views::NativeButton(
- this, UTF16ToWideHack(
- delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL)));
- cancel_button_->SetAccessibleName(cancel_button_->label());
+ ok_button_ = InfoBarTextButton::Create(this,
+ delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
+ ok_button_->SetAccessibleName(ok_button_->text());
+ cancel_button_ = InfoBarTextButton::Create(this,
+ delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL));
+ cancel_button_->SetAccessibleName(cancel_button_->text());
// Set up the link.
link_ = new views::Link;
diff --git a/chrome/browser/ui/views/infobars/infobars.h b/chrome/browser/ui/views/infobars/infobars.h
index b6fc879..4b8e6aa 100644
--- a/chrome/browser/ui/views/infobars/infobars.h
+++ b/chrome/browser/ui/views/infobars/infobars.h
@@ -14,6 +14,7 @@
#include "views/focus/focus_manager.h"
class InfoBarContainer;
+class InfoBarTextButton;
namespace ui {
class SlideAnimation;
@@ -24,7 +25,6 @@ class ExternalFocusTracker;
class ImageButton;
class ImageView;
class Label;
-class NativeButton;
}
// This file contains implementations for some general purpose InfoBars. See
@@ -242,8 +242,8 @@ class ConfirmInfoBar : public AlertInfoBar,
ConfirmInfoBarDelegate* GetDelegate();
- views::NativeButton* ok_button_;
- views::NativeButton* cancel_button_;
+ InfoBarTextButton* ok_button_;
+ InfoBarTextButton* cancel_button_;
views::Link* link_;
bool initialized_;