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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/gtk/global_error_bubble.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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/global_error/global_error.h ('K') | « chrome/browser/ui/global_error/global_error_service_unittest.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/global_error_bubble.cc
diff --git a/chrome/browser/ui/gtk/global_error_bubble.cc b/chrome/browser/ui/gtk/global_error_bubble.cc
index c28cb49cd255d2a347df495a4ad8bf584f9fc9e7..47607cb29a1e3aae60367d029bf99591fc657e3b 100644
--- a/chrome/browser/ui/gtk/global_error_bubble.cc
+++ b/chrome/browser/ui/gtk/global_error_bubble.cc
@@ -55,8 +55,12 @@ GlobalErrorBubble::GlobalErrorBubble(Browser* browser,
GtkWidget* title_label = theme_service->BuildLabel(
UTF16ToUTF8(error_->GetBubbleViewTitle()),
ui::kGdkBlack);
+ // TODO(yoz): Support multi-line messages.
+ string16 message;
+ if (!error_->GetBubbleViewMessages().empty())
+ message = error_->GetBubbleViewMessages()[0];
message_label_ = theme_service->BuildLabel(
- UTF16ToUTF8(error_->GetBubbleViewMessage()),
+ UTF16ToUTF8(message),
ui::kGdkBlack);
gtk_util::ForceFontSizePixels(message_label_, kMessageTextSize);
// Message label will be sized later in "realize" callback because we need
« chrome/browser/ui/global_error/global_error.h ('K') | « chrome/browser/ui/global_error/global_error_service_unittest.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698