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

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

Issue 113612: Make views/ use strings from app_strings. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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.cc ('k') | views/controls/menu/chrome_menu.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/gfx/canvas.h" 8 #include "app/gfx/canvas.h"
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
11 #include "app/win_util.h" 11 #include "app/win_util.h"
12 #include "grit/generated_resources.h" 12 #include "grit/app_strings.h"
13 #include "grit/theme_resources.h" 13 #include "grit/theme_resources.h"
14 #include "views/controls/button/button.h" 14 #include "views/controls/button/button.h"
15 #include "views/controls/menu/view_menu_delegate.h" 15 #include "views/controls/menu/view_menu_delegate.h"
16 #include "views/event.h" 16 #include "views/event.h"
17 #include "views/widget/root_view.h" 17 #include "views/widget/root_view.h"
18 #include "views/widget/widget.h" 18 #include "views/widget/widget.h"
19 19
20 using base::Time; 20 using base::Time;
21 using base::TimeDelta; 21 using base::TimeDelta;
22 22
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 224
225 //////////////////////////////////////////////////////////////////////////////// 225 ////////////////////////////////////////////////////////////////////////////////
226 // 226 //
227 // MenuButton - accessibility 227 // MenuButton - accessibility
228 // 228 //
229 //////////////////////////////////////////////////////////////////////////////// 229 ////////////////////////////////////////////////////////////////////////////////
230 230
231 bool MenuButton::GetAccessibleDefaultAction(std::wstring* action) { 231 bool MenuButton::GetAccessibleDefaultAction(std::wstring* action) {
232 DCHECK(action); 232 DCHECK(action);
233 233
234 action->assign(l10n_util::GetString(IDS_ACCACTION_PRESS)); 234 action->assign(l10n_util::GetString(IDS_APP_ACCACTION_PRESS));
235 return true; 235 return true;
236 } 236 }
237 237
238 bool MenuButton::GetAccessibleRole(AccessibilityTypes::Role* role) { 238 bool MenuButton::GetAccessibleRole(AccessibilityTypes::Role* role) {
239 DCHECK(role); 239 DCHECK(role);
240 240
241 *role = AccessibilityTypes::ROLE_BUTTONDROPDOWN; 241 *role = AccessibilityTypes::ROLE_BUTTONDROPDOWN;
242 return true; 242 return true;
243 } 243 }
244 244
245 bool MenuButton::GetAccessibleState(AccessibilityTypes::State* state) { 245 bool MenuButton::GetAccessibleState(AccessibilityTypes::State* state) {
246 DCHECK(state); 246 DCHECK(state);
247 247
248 *state = AccessibilityTypes::STATE_HASPOPUP; 248 *state = AccessibilityTypes::STATE_HASPOPUP;
249 return true; 249 return true;
250 } 250 }
251 251
252 } // namespace views 252 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/button/button_dropdown.cc ('k') | views/controls/menu/chrome_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698