ui/views/widget/desktop_aura/desktop_native_widget_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/widget/desktop_aura/desktop_native_widget_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/widget/desktop_aura/desktop_native_widget_aura.h

diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h

index ca4bca2105da76e44b19bc389d8cb380f04fde99..c5ac716ad0920706b5a4ac476edcb81e2e5e1d72 100644

--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h

+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h

@@ -117,7 +117,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura

virtual void GetWindowPlacement(

gfx::Rect* bounds,

ui::WindowShowState* maximized) const OVERRIDE;

- virtual bool SetWindowTitle(const string16& title) OVERRIDE;

+ virtual bool SetWindowTitle(const base::string16& title) OVERRIDE;

virtual void SetWindowIcons(const gfx::ImageSkia& window_icon,

const gfx::ImageSkia& app_icon) OVERRIDE;

virtual void InitModalType(ui::ModalType modal_type) OVERRIDE;