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

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

Issue 2855093002: Remove a new usage of LabelButton::SetStyle (in ChromeCleanerDialog). (Closed)
Patch Set: views:: Created 3 years, 7 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/chrome_cleaner_dialog.cc
diff --git a/chrome/browser/ui/views/chrome_cleaner_dialog.cc b/chrome/browser/ui/views/chrome_cleaner_dialog.cc
index 0c45ecddc62314f44504ba1e7a2587ced27405d6..af1501f70ef5ecb50f830cbab37f355ee47062b8 100644
--- a/chrome/browser/ui/views/chrome_cleaner_dialog.cc
+++ b/chrome/browser/ui/views/chrome_cleaner_dialog.cc
@@ -14,6 +14,7 @@
#include "ui/events/event.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/text_constants.h"
+#include "ui/views/controls/button/md_text_button.h"
#include "ui/views/controls/label.h"
#include "ui/views/layout/box_layout.h"
#include "ui/views/layout/layout_constants.h"
@@ -39,10 +40,7 @@ constexpr int kDialogWidth = 448;
ChromeCleanerDialog::ChromeCleanerDialog(
safe_browsing::ChromeCleanerDialogController* controller)
- : browser_(nullptr),
- controller_(controller),
- advanced_button_(
- new views::LabelButton(this, controller_->GetAdvancedButtonLabel())) {
+ : browser_(nullptr), controller_(controller) {
DCHECK(controller_);
SetLayoutManager(new views::BoxLayout(
@@ -54,8 +52,6 @@ ChromeCleanerDialog::ChromeCleanerDialog(
label->SetMultiLine(true);
label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
AddChildView(label);
-
- advanced_button_->SetStyle(views::Button::STYLE_BUTTON);
}
ChromeCleanerDialog::~ChromeCleanerDialog() {
@@ -107,7 +103,8 @@ base::string16 ChromeCleanerDialog::GetDialogButtonLabel(
}
views::View* ChromeCleanerDialog::CreateExtraView() {
- return advanced_button_;
+ return views::MdTextButton::CreateSecondaryUiButton(
+ this, controller_->GetAdvancedButtonLabel());
}
bool ChromeCleanerDialog::Accept() {
@@ -144,7 +141,6 @@ gfx::Size ChromeCleanerDialog::GetPreferredSize() const {
void ChromeCleanerDialog::ButtonPressed(views::Button* sender,
const ui::Event& event) {
- DCHECK_EQ(sender, advanced_button_);
DCHECK(browser_);
// TODO(alito): Navigate to the webui version of the Chrome Cleaner UI when
« no previous file with comments | « chrome/browser/ui/views/chrome_cleaner_dialog.h ('k') | chrome/browser/ui/views/translate/translate_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698