views/controls/menu/menu_item_view.cc - Issue 7210060: Rename app_strings to ui_strings.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: views/controls/menu/menu_item_view.cc

Issue 7210060: Rename app_strings to ui_strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 5 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.cc ('k') | views/controls/menu/menu_item_view_win.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/menu/menu_item_view.h"	5 #include "views/controls/menu/menu_item_view.h"

6	6

7 #include "base/i18n/case_conversion.h"	7 #include "base/i18n/case_conversion.h"

8 #include "base/stl_util-inl.h"	8 #include "base/stl_util-inl.h"

9 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

10 #include "grit/app_strings.h"	10 #include "grit/ui_strings.h"

11 #include "ui/base/accessibility/accessible_view_state.h"	11 #include "ui/base/accessibility/accessible_view_state.h"

12 #include "ui/base/l10n/l10n_util.h"	12 #include "ui/base/l10n/l10n_util.h"

13 #include "ui/base/models/menu_model.h"	13 #include "ui/base/models/menu_model.h"

14 #include "ui/gfx/canvas.h"	14 #include "ui/gfx/canvas.h"

15 #include "views/controls/button/menu_button.h"	15 #include "views/controls/button/menu_button.h"

16 #include "views/controls/button/text_button.h"	16 #include "views/controls/button/text_button.h"

17 #include "views/controls/menu/menu_config.h"	17 #include "views/controls/menu/menu_config.h"

18 #include "views/controls/menu/menu_controller.h"	18 #include "views/controls/menu/menu_controller.h"

19 #include "views/controls/menu/menu_separator.h"	19 #include "views/controls/menu/menu_separator.h"

20 #include "views/controls/menu/submenu_view.h"	20 #include "views/controls/menu/submenu_view.h"

(...skipping 730 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
751 return string16();	751 return string16();

752 }	752 }

753	753

754 Accelerator accelerator;	754 Accelerator accelerator;

755 return (GetDelegate() &&	755 return (GetDelegate() &&

756 GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?	756 GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?

757 accelerator.GetShortcutText() : string16();	757 accelerator.GetShortcutText() : string16();

758 }	758 }

759	759

760 } // namespace views	760 } // namespace views

OLD	NEW