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

Side by Side Diff: chrome/browser/ui/views/chrome_cleaner_dialog.cc

Issue 2855093002: Remove a new usage of LabelButton::SetStyle (in ChromeCleanerDialog). (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/chrome_cleaner_dialog.h" 5 #include "chrome/browser/ui/views/chrome_cleaner_dialog.h"
6 6
7 #include "base/strings/string16.h" 7 #include "base/strings/string16.h"
8 #include "chrome/browser/safe_browsing/chrome_cleaner_dialog_controller.h" 8 #include "chrome/browser/safe_browsing/chrome_cleaner_dialog_controller.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_dialogs.h" 10 #include "chrome/browser/ui/browser_dialogs.h"
11 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
12 #include "components/constrained_window/constrained_window_views.h" 12 #include "components/constrained_window/constrained_window_views.h"
13 #include "ui/base/ui_base_types.h" 13 #include "ui/base/ui_base_types.h"
14 #include "ui/events/event.h" 14 #include "ui/events/event.h"
15 #include "ui/gfx/native_widget_types.h" 15 #include "ui/gfx/native_widget_types.h"
16 #include "ui/gfx/text_constants.h" 16 #include "ui/gfx/text_constants.h"
17 #include "ui/views/controls/button/md_text_button.h"
17 #include "ui/views/controls/label.h" 18 #include "ui/views/controls/label.h"
18 #include "ui/views/layout/box_layout.h" 19 #include "ui/views/layout/box_layout.h"
19 #include "ui/views/layout/layout_constants.h" 20 #include "ui/views/layout/layout_constants.h"
20 #include "ui/views/widget/widget.h" 21 #include "ui/views/widget/widget.h"
21 22
22 namespace chrome { 23 namespace chrome {
23 24
24 void ShowChromeCleanerPrompt( 25 void ShowChromeCleanerPrompt(
25 Browser* browser, 26 Browser* browser,
26 safe_browsing::ChromeCleanerDialogController* controller) { 27 safe_browsing::ChromeCleanerDialogController* controller) {
27 ChromeCleanerDialog* dialog = new ChromeCleanerDialog(controller); 28 ChromeCleanerDialog* dialog = new ChromeCleanerDialog(controller);
28 dialog->Show(browser); 29 dialog->Show(browser);
29 } 30 }
30 31
31 } // namespace chrome 32 } // namespace chrome
32 33
33 namespace { 34 namespace {
34 constexpr int kDialogWidth = 448; 35 constexpr int kDialogWidth = 448;
35 } // namespace 36 } // namespace
36 37
37 //////////////////////////////////////////////////////////////////////////////// 38 ////////////////////////////////////////////////////////////////////////////////
38 // ChromeCleanerDialog 39 // ChromeCleanerDialog
39 40
40 ChromeCleanerDialog::ChromeCleanerDialog( 41 ChromeCleanerDialog::ChromeCleanerDialog(
41 safe_browsing::ChromeCleanerDialogController* controller) 42 safe_browsing::ChromeCleanerDialogController* controller)
42 : browser_(nullptr), 43 : browser_(nullptr),
43 controller_(controller), 44 controller_(controller),
44 advanced_button_( 45 advanced_button_(MdTextButton::CreateSecondaryUiButton(
tapted 2017/05/03 01:36:02 optional: the member isn't really needed.. ChromeC
Evan Stade 2017/05/03 15:10:39 I'm on the fence because I think that DCHECK is mi
45 new views::LabelButton(this, controller_->GetAdvancedButtonLabel())) { 46 this,
47 controller_->GetAdvancedButtonLabel())) {
46 DCHECK(controller_); 48 DCHECK(controller_);
47 49
48 SetLayoutManager(new views::BoxLayout( 50 SetLayoutManager(new views::BoxLayout(
49 /*orientation=*/views::BoxLayout::kVertical, 51 /*orientation=*/views::BoxLayout::kVertical,
50 /*inside_border_horizontal_spacing=*/views::kButtonHEdgeMarginNew, 52 /*inside_border_horizontal_spacing=*/views::kButtonHEdgeMarginNew,
51 /*inside_border_vertical_spacing=*/views::kPanelVertMargin, 53 /*inside_border_vertical_spacing=*/views::kPanelVertMargin,
52 /*between_child_spacing=*/0)); 54 /*between_child_spacing=*/0));
53 views::Label* label = new views::Label(controller_->GetMainText()); 55 views::Label* label = new views::Label(controller_->GetMainText());
54 label->SetMultiLine(true); 56 label->SetMultiLine(true);
55 label->SetHorizontalAlignment(gfx::ALIGN_LEFT); 57 label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
56 AddChildView(label); 58 AddChildView(label);
57
58 advanced_button_->SetStyle(views::Button::STYLE_BUTTON);
59 } 59 }
60 60
61 ChromeCleanerDialog::~ChromeCleanerDialog() { 61 ChromeCleanerDialog::~ChromeCleanerDialog() {
62 // Make sure the controller is correctly notified in case the dialog widget is 62 // Make sure the controller is correctly notified in case the dialog widget is
63 // closed by some other means than the dialog buttons. 63 // closed by some other means than the dialog buttons.
64 if (controller_) 64 if (controller_)
65 controller_->Cancel(); 65 controller_->Cancel();
66 } 66 }
67 67
68 void ChromeCleanerDialog::Show(Browser* browser) { 68 void ChromeCleanerDialog::Show(Browser* browser) {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 DCHECK(browser_); 148 DCHECK(browser_);
149 149
150 // TODO(alito): Navigate to the webui version of the Chrome Cleaner UI when 150 // TODO(alito): Navigate to the webui version of the Chrome Cleaner UI when
151 // that is implemented. 151 // that is implemented.
152 if (controller_) { 152 if (controller_) {
153 controller_->AdvancedButtonClicked(); 153 controller_->AdvancedButtonClicked();
154 controller_ = nullptr; 154 controller_ = nullptr;
155 } 155 }
156 GetWidget()->Close(); 156 GetWidget()->Close();
157 } 157 }
OLDNEW
« 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