Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4313)

Unified Diff: chrome/browser/ui/cocoa/global_error_bubble_controller.mm

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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/global_error_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
index a7d125b2e0c370052c0d8e2d8f2079bf9d4b40a0..c4056b82e0047f93485d398f49c65294f6e9937e 100644
--- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
@@ -84,7 +84,11 @@ class Bridge : public GlobalErrorBubbleViewBase {
error_->GetBubbleViewIconResourceID()).ToNSImage()];
[title_ setStringValue:SysUTF16ToNSString(error_->GetBubbleViewTitle())];
- [message_ setStringValue:SysUTF16ToNSString(error_->GetBubbleViewMessage())];
+ // TODO(yoz): Support multi-line messages.
+ string16 message;
+ if (!error_->GetBubbleViewMessages().empty())
+ message = error_->GetBubbleViewMessages()[0];
+ [message_ setStringValue:SysUTF16ToNSString(message)];
[acceptButton_ setTitle:
SysUTF16ToNSString(error_->GetBubbleViewAcceptButtonLabel())];
string16 cancelLabel = error_->GetBubbleViewCancelButtonLabel();

Powered by Google App Engine
This is Rietveld 408576698