Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7667)

Unified Diff: chrome/browser/ui/views/speech_recognition_bubble_views.cc

Issue 13584010: views: Migrate the cases of "new .*NativeTextButton(" to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: back out the changes to one_click_signin_bubble_view.* Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/speech_recognition_bubble_views.cc
diff --git a/chrome/browser/ui/views/speech_recognition_bubble_views.cc b/chrome/browser/ui/views/speech_recognition_bubble_views.cc
index 7c62acf8ca7876a9e7571ab70c3e597e7f299d7f..cbb1ea4751ef0d78bd7a1e641b31c22201ac83e0 100644
--- a/chrome/browser/ui/views/speech_recognition_bubble_views.cc
+++ b/chrome/browser/ui/views/speech_recognition_bubble_views.cc
@@ -21,7 +21,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/views/bubble/bubble_delegate.h"
-#include "ui/views/controls/button/text_button.h"
+#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
#include "ui/views/controls/link.h"
@@ -39,10 +39,9 @@ const int kIconHorizontalOffset = 27;
const int kIconVerticalOffset = -7;
// This is the SpeechRecognitionBubble content and views bubble delegate.
-class SpeechRecognitionBubbleView
- : public views::BubbleDelegateView,
- public views::ButtonListener,
- public views::LinkListener {
+class SpeechRecognitionBubbleView : public views::BubbleDelegateView,
+ public views::ButtonListener,
+ public views::LinkListener {
public:
SpeechRecognitionBubbleView(SpeechRecognitionBubbleDelegate* delegate,
views::View* anchor_view,
@@ -83,8 +82,8 @@ class SpeechRecognitionBubbleView
views::ImageView* icon_;
views::Label* heading_;
views::Label* message_;
- views::TextButton* try_again_;
- views::TextButton* cancel_;
+ views::LabelButton* try_again_;
+ views::LabelButton* cancel_;
views::Link* mic_settings_;
SpeechRecognitionBubbleBase::DisplayMode display_mode_;
const int kIconLayoutMinWidth;
@@ -157,12 +156,13 @@ void SpeechRecognitionBubbleView::Init() {
icon_->SetHorizontalAlignment(views::ImageView::CENTER);
AddChildView(icon_);
- cancel_ = new views::NativeTextButton(
- this, l10n_util::GetStringUTF16(IDS_CANCEL));
+ cancel_ = new views::LabelButton(this, l10n_util::GetStringUTF16(IDS_CANCEL));
+ cancel_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
AddChildView(cancel_);
- try_again_ = new views::NativeTextButton(
+ try_again_ = new views::LabelButton(
this, l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_TRY_AGAIN));
+ try_again_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
AddChildView(try_again_);
mic_settings_ = new views::Link(
« no previous file with comments | « chrome/browser/ui/views/password_generation_bubble_view.cc ('k') | ui/views/focus/focus_manager_unittest_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698