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

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

Issue 1963563002: Views: Flip default value of CustomButton::request_focus_on_press_ to false. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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
« no previous file with comments | « ui/message_center/views/padded_button.cc ('k') | ui/views/controls/button/custom_button.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/checkbox.h" 5 #include "ui/views/controls/button/checkbox.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 11 matching lines...) Expand all
22 22
23 Checkbox::Checkbox(const base::string16& label) 23 Checkbox::Checkbox(const base::string16& label)
24 : LabelButton(NULL, label), 24 : LabelButton(NULL, label),
25 checked_(false) { 25 checked_(false) {
26 SetHorizontalAlignment(gfx::ALIGN_LEFT); 26 SetHorizontalAlignment(gfx::ALIGN_LEFT);
27 std::unique_ptr<LabelButtonBorder> button_border(new LabelButtonBorder()); 27 std::unique_ptr<LabelButtonBorder> button_border(new LabelButtonBorder());
28 // Inset the trailing side by a couple pixels for the focus border. 28 // Inset the trailing side by a couple pixels for the focus border.
29 button_border->set_insets(gfx::Insets(0, 0, 0, 2)); 29 button_border->set_insets(gfx::Insets(0, 0, 0, 2));
30 SetBorder(std::move(button_border)); 30 SetBorder(std::move(button_border));
31 Button::ConfigureDefaultFocus(this); 31 Button::ConfigureDefaultFocus(this);
32 set_request_focus_on_press(true);
32 33
33 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 34 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
34 35
35 // Unchecked/Unfocused images. 36 // Unchecked/Unfocused images.
36 SetCustomImage(false, false, STATE_NORMAL, 37 SetCustomImage(false, false, STATE_NORMAL,
37 *rb.GetImageSkiaNamed(IDR_CHECKBOX)); 38 *rb.GetImageSkiaNamed(IDR_CHECKBOX));
38 SetCustomImage(false, false, STATE_HOVERED, 39 SetCustomImage(false, false, STATE_HOVERED,
39 *rb.GetImageSkiaNamed(IDR_CHECKBOX_HOVER)); 40 *rb.GetImageSkiaNamed(IDR_CHECKBOX_HOVER));
40 SetCustomImage(false, false, STATE_PRESSED, 41 SetCustomImage(false, false, STATE_PRESSED,
41 *rb.GetImageSkiaNamed(IDR_CHECKBOX_PRESSED)); 42 *rb.GetImageSkiaNamed(IDR_CHECKBOX_PRESSED));
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 ui::NativeTheme::Part Checkbox::GetThemePart() const { 142 ui::NativeTheme::Part Checkbox::GetThemePart() const {
142 return ui::NativeTheme::kCheckbox; 143 return ui::NativeTheme::kCheckbox;
143 } 144 }
144 145
145 void Checkbox::GetExtraParams(ui::NativeTheme::ExtraParams* params) const { 146 void Checkbox::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
146 LabelButton::GetExtraParams(params); 147 LabelButton::GetExtraParams(params);
147 params->button.checked = checked_; 148 params->button.checked = checked_;
148 } 149 }
149 150
150 } // namespace views 151 } // namespace views
OLDNEW
« no previous file with comments | « ui/message_center/views/padded_button.cc ('k') | ui/views/controls/button/custom_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698