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

Side by Side Diff: views/controls/button/menu_button.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/menu_button.h ('k') | views/controls/button/native_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) 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/menu_button.h" 5 #include "views/controls/button/menu_button.h"
6 6
7 #include "app/drag_drop_types.h" 7 #include "app/drag_drop_types.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 SetState(BS_NORMAL); 249 SetState(BS_NORMAL);
250 } 250 }
251 } 251 }
252 252
253 //////////////////////////////////////////////////////////////////////////////// 253 ////////////////////////////////////////////////////////////////////////////////
254 // 254 //
255 // MenuButton - accessibility 255 // MenuButton - accessibility
256 // 256 //
257 //////////////////////////////////////////////////////////////////////////////// 257 ////////////////////////////////////////////////////////////////////////////////
258 258
259 std::wstring MenuButton::GetAccessibleDefaultAction() { 259 string16 MenuButton::GetAccessibleDefaultAction() {
260 return UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS)); 260 return l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
261 } 261 }
262 262
263 AccessibilityTypes::Role MenuButton::GetAccessibleRole() { 263 AccessibilityTypes::Role MenuButton::GetAccessibleRole() {
264 return AccessibilityTypes::ROLE_BUTTONMENU; 264 return AccessibilityTypes::ROLE_BUTTONMENU;
265 } 265 }
266 266
267 AccessibilityTypes::State MenuButton::GetAccessibleState() { 267 AccessibilityTypes::State MenuButton::GetAccessibleState() {
268 return AccessibilityTypes::STATE_HASPOPUP; 268 return AccessibilityTypes::STATE_HASPOPUP;
269 } 269 }
270 270
271 std::string MenuButton::GetClassName() const { 271 std::string MenuButton::GetClassName() const {
272 return kViewClassName; 272 return kViewClassName;
273 } 273 }
274 274
275 } // namespace views 275 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/button/menu_button.h ('k') | views/controls/button/native_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698