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

Side by Side Diff: views/controls/button/button_dropdown.cc

Issue 6192007: Remove wstring from views. Part 3: Switch accessibility strings to string16.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « views/controls/button/button_dropdown.h ('k') | views/controls/button/menu_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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "views/controls/button/button_dropdown.h" 5 #include "views/controls/button/button_dropdown.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 SetMouseHandler(NULL); 158 SetMouseHandler(NULL);
159 } 159 }
160 } 160 }
161 161
162 //////////////////////////////////////////////////////////////////////////////// 162 ////////////////////////////////////////////////////////////////////////////////
163 // 163 //
164 // ButtonDropDown - Accessibility 164 // ButtonDropDown - Accessibility
165 // 165 //
166 //////////////////////////////////////////////////////////////////////////////// 166 ////////////////////////////////////////////////////////////////////////////////
167 167
168 std::wstring ButtonDropDown::GetAccessibleDefaultAction() { 168 string16 ButtonDropDown::GetAccessibleDefaultAction() {
169 return UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS)); 169 return l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
170 } 170 }
171 171
172 AccessibilityTypes::Role ButtonDropDown::GetAccessibleRole() { 172 AccessibilityTypes::Role ButtonDropDown::GetAccessibleRole() {
173 return AccessibilityTypes::ROLE_BUTTONDROPDOWN; 173 return AccessibilityTypes::ROLE_BUTTONDROPDOWN;
174 } 174 }
175 175
176 AccessibilityTypes::State ButtonDropDown::GetAccessibleState() { 176 AccessibilityTypes::State ButtonDropDown::GetAccessibleState() {
177 return AccessibilityTypes::STATE_HASPOPUP; 177 return AccessibilityTypes::STATE_HASPOPUP;
178 } 178 }
179 179
180 } // namespace views 180 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/button/button_dropdown.h ('k') | views/controls/button/menu_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698