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

Unified Diff: chrome/browser/ui/views/download/download_item_view.cc

Issue 13584010: views: Migrate the cases of "new .*NativeTextButton(" to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: one more fix in one_click_signin_bubble_view.cc Created 7 years, 9 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/download/download_item_view.cc
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index bba014758c0ab99a544c1675aed9a2a99595fdf3..5e405ecbfcead54a32fc865e508adf7364071a7d 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -38,7 +38,7 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/image/image.h"
-#include "ui/views/controls/button/text_button.h"
+#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/label.h"
#include "ui/views/widget/root_view.h"
#include "ui/views/widget/widget.h"
@@ -1044,14 +1044,16 @@ void DownloadItemView::ShowWarningDialog() {
body_state_ = NORMAL;
drop_down_state_ = NORMAL;
if (mode_ == DANGEROUS_MODE) {
- save_button_ = new views::NativeTextButton(
+ save_button_ = new views::LabelButton(
this, model_.GetWarningConfirmButtonText());
- save_button_->set_ignore_minimum_size(true);
+ save_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+ save_button_->set_min_size(gfx::Size());
msw 2013/04/04 02:31:03 Interestingly, TextButton::set_ignore_minimum_size
tfarina 2013/04/04 22:36:52 Done.
AddChildView(save_button_);
}
- discard_button_ = new views::NativeTextButton(
+ discard_button_ = new views::LabelButton(
this, l10n_util::GetStringUTF16(IDS_DISCARD_DOWNLOAD));
- discard_button_->set_ignore_minimum_size(true);
+ discard_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+ discard_button_->set_min_size(gfx::Size());
msw 2013/04/04 02:31:03 Remove set_min_size as per my earlier comment.
tfarina 2013/04/04 22:36:52 Done.
AddChildView(discard_button_);
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

Powered by Google App Engine
This is Rietveld 408576698