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

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

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/button/radio_button.h ('k') | ui/views/controls/button/text_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/radio_button.h" 5 #include "ui/views/controls/button/radio_button.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "grit/ui_resources.h" 8 #include "grit/ui_resources.h"
9 #include "ui/base/accessibility/accessible_view_state.h" 9 #include "ui/base/accessibility/accessible_view_state.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 #include "ui/views/widget/widget.h" 11 #include "ui/views/widget/widget.h"
12 12
13 namespace views { 13 namespace views {
14 14
15 // static 15 // static
16 const char RadioButton::kViewClassName[] = "RadioButton"; 16 const char RadioButton::kViewClassName[] = "RadioButton";
17 17
18 RadioButton::RadioButton(const string16& label, int group_id) 18 RadioButton::RadioButton(const base::string16& label, int group_id)
19 : Checkbox(label) { 19 : Checkbox(label) {
20 SetGroup(group_id); 20 SetGroup(group_id);
21 21
22 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 22 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
23 23
24 // Unchecked/Unfocused images. 24 // Unchecked/Unfocused images.
25 SetCustomImage(false, false, STATE_NORMAL, 25 SetCustomImage(false, false, STATE_NORMAL,
26 *rb.GetImageSkiaNamed(IDR_RADIO)); 26 *rb.GetImageSkiaNamed(IDR_RADIO));
27 SetCustomImage(false, false, STATE_HOVERED, 27 SetCustomImage(false, false, STATE_HOVERED,
28 *rb.GetImageSkiaNamed(IDR_RADIO_HOVER)); 28 *rb.GetImageSkiaNamed(IDR_RADIO_HOVER));
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 SetChecked(true); 134 SetChecked(true);
135 RequestFocus(); 135 RequestFocus();
136 LabelButton::NotifyClick(event); 136 LabelButton::NotifyClick(event);
137 } 137 }
138 138
139 ui::NativeTheme::Part RadioButton::GetThemePart() const { 139 ui::NativeTheme::Part RadioButton::GetThemePart() const {
140 return ui::NativeTheme::kRadio; 140 return ui::NativeTheme::kRadio;
141 } 141 }
142 142
143 } // namespace views 143 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/radio_button.h ('k') | ui/views/controls/button/text_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698