ui/views/corewm/tooltip_aura.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/corewm/tooltip_aura.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/corewm/tooltip_aura.h

diff --git a/ui/views/corewm/tooltip_aura.h b/ui/views/corewm/tooltip_aura.h

index 97f3737aa8eaf4a77444f296c242d812c1bcd1b0..f267236f468a12b143ad5a71edfd859666a59271 100644

--- a/ui/views/corewm/tooltip_aura.h

+++ b/ui/views/corewm/tooltip_aura.h

@@ -28,7 +28,7 @@ class VIEWS_EXPORT TooltipAura : public Tooltip, public WidgetObserver {

// give the location of the tooltip in screen coordinates. |max_width| comes

// from GetMaxWidth().

static void TrimTooltipToFit(int max_width,

- string16* text,

+ base::string16* text,

int* width,

int* line_count);

@@ -53,7 +53,7 @@ class VIEWS_EXPORT TooltipAura : public Tooltip, public WidgetObserver {

// Tooltip:

virtual void SetText(aura::Window* window,

- const string16& tooltip_text,

+ const base::string16& tooltip_text,

const gfx::Point& location) OVERRIDE;

virtual void Show() OVERRIDE;

virtual void Hide() OVERRIDE;

« no previous file with comments | « ui/views/corewm/tooltip.h ('k') | ui/views/corewm/tooltip_aura.cc » ('j') | no next file with comments »