ui/views/controls/menu/menu_model_adapter.h - Issue 117983002: Prefix string16 with base:: in ui/.

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

Unified Diff: ui/views/controls/menu/menu_model_adapter.h

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:

Index: ui/views/controls/menu/menu_model_adapter.h

diff --git a/ui/views/controls/menu/menu_model_adapter.h b/ui/views/controls/menu/menu_model_adapter.h

index 4db9dbe2cf9ba3c52b97ee36113fa84f77340156..f8f6e1939632db6495b29e9f5c870373ae48aca5 100644

--- a/ui/views/controls/menu/menu_model_adapter.h

+++ b/ui/views/controls/menu/menu_model_adapter.h

@@ -68,7 +68,7 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate {

const ui::Event& e) OVERRIDE;

virtual bool GetAccelerator(int id,

ui::Accelerator* accelerator) OVERRIDE;

- virtual string16 GetLabel(int id) const OVERRIDE;

+ virtual base::string16 GetLabel(int id) const OVERRIDE;

virtual const gfx::Font* GetLabelFont(int id) const OVERRIDE;

virtual bool IsCommandEnabled(int id) const OVERRIDE;

virtual bool IsItemChecked(int id) const OVERRIDE;