ui/views/window/dialog_client_view.cc - 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/window/dialog_client_view.cc

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/window/dialog_client_view.cc

diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc

index bfb870ed50ba5f737ea18cc26821be85e792f1e1..ed9fce24221bca6a8c13b89bb066e77881eedfdc 100644

--- a/ui/views/window/dialog_client_view.cc

+++ b/ui/views/window/dialog_client_view.cc

@@ -359,7 +359,7 @@ void DialogClientView::ChildVisibilityChanged(View* child) {

// DialogClientView, private:

LabelButton* DialogClientView::CreateDialogButton(ui::DialogButton type) {

- const string16 title = GetDialogDelegate()->GetDialogButtonLabel(type);

+ const base::string16 title = GetDialogDelegate()->GetDialogButtonLabel(type);

LabelButton* button = NULL;

if (GetDialogDelegate()->UseNewStyleForThisDialog() &&

GetDialogDelegate()->GetDefaultDialogButton() == type &&

« no previous file with comments | « ui/views/win/hwnd_message_handler.cc ('k') | ui/views/window/dialog_delegate_unittest.cc » ('j') | no next file with comments »