chrome/browser/sync/sync_global_error.cc - Issue 14262009: Add support for multi-line GlobalError messages to Views.

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: chrome/browser/sync/sync_global_error.cc

Issue 14262009: Add support for multi-line GlobalError messages to Views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 8 months 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: chrome/browser/sync/sync_global_error.cc

diff --git a/chrome/browser/sync/sync_global_error.cc b/chrome/browser/sync/sync_global_error.cc

index 622ad76a9d462b83e0987a9fa3748ba575035c4c..11c2a2c3c5af6fd54c70cf04f380aa81cd8d0ce5 100644

--- a/chrome/browser/sync/sync_global_error.cc

+++ b/chrome/browser/sync/sync_global_error.cc

@@ -64,8 +64,8 @@ string16 SyncGlobalError::GetBubbleViewTitle() {

return l10n_util::GetStringUTF16(IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE);

}

-string16 SyncGlobalError::GetBubbleViewMessage() {

- return bubble_message_;

+std::vector<string16> SyncGlobalError::GetBubbleViewMessages() {

+ return std::vector<string16>(1, bubble_message_);

}

string16 SyncGlobalError::GetBubbleViewAcceptButtonLabel() {