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

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

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

Powered by Google App Engine
This is Rietveld 408576698