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

Side by Side Diff: ui/views/controls/button/blue_button.cc

Issue 2801583002: Use views::style for buttons, bootstrap ash_typography to do so. (Closed)
Patch Set: rebase for epic ash file move Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ui/views/controls/button/blue_button.h" 5 #include "ui/views/controls/button/blue_button.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/gfx/color_utils.h" 10 #include "ui/gfx/color_utils.h"
11 #include "ui/gfx/geometry/vector2d.h" 11 #include "ui/gfx/geometry/vector2d.h"
12 #include "ui/resources/grit/ui_resources.h" 12 #include "ui/resources/grit/ui_resources.h"
13 #include "ui/views/controls/button/label_button_border.h" 13 #include "ui/views/controls/button/label_button_border.h"
14 #include "ui/views/resources/grit/views_resources.h" 14 #include "ui/views/resources/grit/views_resources.h"
15 15
16 namespace views { 16 namespace views {
17 17
18 // static 18 // static
19 const char BlueButton::kViewClassName[] = "views/BlueButton"; 19 const char BlueButton::kViewClassName[] = "views/BlueButton";
20 20
21 BlueButton::BlueButton(ButtonListener* listener, const base::string16& text) 21 BlueButton::BlueButton(ButtonListener* listener, const base::string16& text)
22 : LabelButton(listener, text) { 22 : LabelButton(listener, text, style::CONTEXT_LABEL) {
23 // Inherit STYLE_BUTTON insets, minimum size, alignment, etc. 23 // Inherit STYLE_BUTTON insets, minimum size, alignment, etc.
24 SetStyle(STYLE_BUTTON); 24 SetStyle(STYLE_BUTTON);
25 UpdateThemedBorder(); 25 UpdateThemedBorder();
26 } 26 }
27 27
28 BlueButton::~BlueButton() {} 28 BlueButton::~BlueButton() {}
29 29
30 void BlueButton::ResetColorsFromNativeTheme() { 30 void BlueButton::ResetColorsFromNativeTheme() {
31 LabelButton::ResetColorsFromNativeTheme(); 31 LabelButton::ResetColorsFromNativeTheme();
32 if (!color_utils::IsInvertedColorScheme()) { 32 if (!color_utils::IsInvertedColorScheme()) {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 button_border->SetPainter(true, STATE_HOVERED, Painter::CreateImagePainter( 70 button_border->SetPainter(true, STATE_HOVERED, Painter::CreateImagePainter(
71 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_HOVER), insets)); 71 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_HOVER), insets));
72 button_border->SetPainter(true, STATE_PRESSED, Painter::CreateImagePainter( 72 button_border->SetPainter(true, STATE_PRESSED, Painter::CreateImagePainter(
73 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_PRESSED), insets)); 73 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_FOCUSED_PRESSED), insets));
74 button_border->SetPainter(true, STATE_DISABLED, Painter::CreateImagePainter( 74 button_border->SetPainter(true, STATE_DISABLED, Painter::CreateImagePainter(
75 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets)); 75 *rb.GetImageSkiaNamed(IDR_BLUE_BUTTON_DISABLED), insets));
76 return std::move(button_border); 76 return std::move(button_border);
77 } 77 }
78 78
79 } // namespace views 79 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698