ui/views/controls/tree/tree_view.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/tree/tree_view.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/tree/tree_view.h

diff --git a/ui/views/controls/tree/tree_view.h b/ui/views/controls/tree/tree_view.h

index de571c789bf2c57c5249eef682158e0c254ae413..b7a4ecaa388c5adb233a122c31a4e2d0d6ea8412 100644

--- a/ui/views/controls/tree/tree_view.h

+++ b/ui/views/controls/tree/tree_view.h

@@ -141,7 +141,7 @@ class VIEWS_EXPORT TreeView : public ui::TreeModelObserver,

// TextfieldController overrides:

virtual void ContentsChanged(Textfield* sender,

- const string16& new_contents) OVERRIDE;

+ const base::string16& new_contents) OVERRIDE;

virtual bool HandleKeyEvent(Textfield* sender,

const ui::KeyEvent& key_event) OVERRIDE;

@@ -155,7 +155,7 @@ class VIEWS_EXPORT TreeView : public ui::TreeModelObserver,

virtual int GetRowCount() OVERRIDE;

virtual int GetSelectedRow() OVERRIDE;

virtual void SetSelectedRow(int row) OVERRIDE;

- virtual string16 GetTextForRow(int row) OVERRIDE;

+ virtual base::string16 GetTextForRow(int row) OVERRIDE;

protected:

// View overrides: