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

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

Issue 1539583003: Convert Pass()→std::move() in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/views/controls/button/blue_button.cc ('k') | ui/views/controls/button/image_button.cc » ('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 <utility>
8
7 #include "ui/accessibility/ax_view_state.h" 9 #include "ui/accessibility/ax_view_state.h"
8 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/resources/grit/ui_resources.h" 11 #include "ui/resources/grit/ui_resources.h"
10 #include "ui/views/controls/button/label_button_border.h" 12 #include "ui/views/controls/button/label_button_border.h"
11 #include "ui/views/painter.h" 13 #include "ui/views/painter.h"
12 #include "ui/views/resources/grit/views_resources.h" 14 #include "ui/views/resources/grit/views_resources.h"
13 15
14 namespace views { 16 namespace views {
15 17
16 // static 18 // static
17 const char Checkbox::kViewClassName[] = "Checkbox"; 19 const char Checkbox::kViewClassName[] = "Checkbox";
18 20
19 Checkbox::Checkbox(const base::string16& label) 21 Checkbox::Checkbox(const base::string16& label)
20 : LabelButton(NULL, label), 22 : LabelButton(NULL, label),
21 checked_(false) { 23 checked_(false) {
22 SetHorizontalAlignment(gfx::ALIGN_LEFT); 24 SetHorizontalAlignment(gfx::ALIGN_LEFT);
23 scoped_ptr<LabelButtonBorder> button_border(new LabelButtonBorder()); 25 scoped_ptr<LabelButtonBorder> button_border(new LabelButtonBorder());
24 // Inset the trailing side by a couple pixels for the focus border. 26 // Inset the trailing side by a couple pixels for the focus border.
25 button_border->set_insets(gfx::Insets(0, 0, 0, 2)); 27 button_border->set_insets(gfx::Insets(0, 0, 0, 2));
26 SetBorder(button_border.Pass()); 28 SetBorder(std::move(button_border));
27 SetFocusable(true); 29 SetFocusable(true);
28 30
29 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 31 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
30 32
31 // Unchecked/Unfocused images. 33 // Unchecked/Unfocused images.
32 SetCustomImage(false, false, STATE_NORMAL, 34 SetCustomImage(false, false, STATE_NORMAL,
33 *rb.GetImageSkiaNamed(IDR_CHECKBOX)); 35 *rb.GetImageSkiaNamed(IDR_CHECKBOX));
34 SetCustomImage(false, false, STATE_HOVERED, 36 SetCustomImage(false, false, STATE_HOVERED,
35 *rb.GetImageSkiaNamed(IDR_CHECKBOX_HOVER)); 37 *rb.GetImageSkiaNamed(IDR_CHECKBOX_HOVER));
36 SetCustomImage(false, false, STATE_PRESSED, 38 SetCustomImage(false, false, STATE_PRESSED,
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 ui::NativeTheme::Part Checkbox::GetThemePart() const { 139 ui::NativeTheme::Part Checkbox::GetThemePart() const {
138 return ui::NativeTheme::kCheckbox; 140 return ui::NativeTheme::kCheckbox;
139 } 141 }
140 142
141 void Checkbox::GetExtraParams(ui::NativeTheme::ExtraParams* params) const { 143 void Checkbox::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
142 LabelButton::GetExtraParams(params); 144 LabelButton::GetExtraParams(params);
143 params->button.checked = checked_; 145 params->button.checked = checked_;
144 } 146 }
145 147
146 } // namespace views 148 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/blue_button.cc ('k') | ui/views/controls/button/image_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698