ui/views/controls/scrollbar/base_scroll_bar.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/scrollbar/base_scroll_bar.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/scrollbar/base_scroll_bar.h

diff --git a/ui/views/controls/scrollbar/base_scroll_bar.h b/ui/views/controls/scrollbar/base_scroll_bar.h

index a517b6c0645c36a86d1e80961f3e41353e6eb9d1..b380376473803266414c5af37935d9fdc62e9c87 100644

--- a/ui/views/controls/scrollbar/base_scroll_bar.h

+++ b/ui/views/controls/scrollbar/base_scroll_bar.h

@@ -93,7 +93,7 @@ class VIEWS_EXPORT BaseScrollBar : public ScrollBar,

ui::MenuSourceType source_type) OVERRIDE;

// Menu::Delegate overrides:

- virtual string16 GetLabel(int id) const OVERRIDE;

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

virtual bool IsCommandEnabled(int id) const OVERRIDE;

virtual void ExecuteCommand(int id) OVERRIDE;