Add support for multi-line GlobalError messages to Views.

chrome/browser/signin/signin_global_error.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/signin/signin_global_error.h"
 
 #include "base/logging.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 100 matching lines @@
   if (login_ui->current_login_ui()) {
     login_ui->current_login_ui()->FocusUI();
     return;
   }
   // Need to navigate to the settings page and display the UI.
   chrome::ShowSettingsSubPage(browser, chrome::kSyncSetupSubPage);
 #endif
 }
 
 bool SigninGlobalError::HasBubbleView() {
-  return !GetBubbleViewMessage().empty();
+  return !GetBubbleViewMessages().empty();
 }
 
 string16 SigninGlobalError::GetBubbleViewTitle() {
   return l10n_util::GetStringUTF16(IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE);
 }
 
-string16 SigninGlobalError::GetBubbleViewMessage() {
+std::vector<string16> SigninGlobalError::GetBubbleViewMessages() {
+  std::vector<string16> messages;
   // If the user isn't signed in, no need to display an error bubble.
   if (signin_manager_->GetAuthenticatedUsername().empty()) {
-    return string16();
+    return messages;
   }
 
   switch (auth_error_.state()) {
     // In the case of no error, or a simple network error, don't bother
     // displaying a popup bubble.
     case GoogleServiceAuthError::CONNECTION_FAILED:
     case GoogleServiceAuthError::NONE:
-      return string16();
+      return messages;
 
     // User credentials are invalid (bad acct, etc).
     case GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS:
     case GoogleServiceAuthError::ACCOUNT_DELETED:
     case GoogleServiceAuthError::ACCOUNT_DISABLED:
-      return l10n_util::GetStringFUTF16(
+      messages.push_back(l10n_util::GetStringFUTF16(
           IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE,
-          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+      break;
 
     // Sync service is not available for this account's domain.
     case GoogleServiceAuthError::SERVICE_UNAVAILABLE:
-      return l10n_util::GetStringFUTF16(
+      messages.push_back(l10n_util::GetStringFUTF16(
           IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE,
-          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+      break;
 
     // Generic message for "other" errors.
     default:
-      return l10n_util::GetStringFUTF16(
+      messages.push_back(l10n_util::GetStringFUTF16(
           IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE,
-          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   }
+  return messages;
 }
 
 string16 SigninGlobalError::GetBubbleViewAcceptButtonLabel() {
   // If the service is unavailable, don't give the user the option to try
   // signing in again.
   if (auth_error_.state() == GoogleServiceAuthError::SERVICE_UNAVAILABLE) {
     return l10n_util::GetStringUTF16(
         IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_ACCEPT);
   } else {
     return l10n_util::GetStringUTF16(IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT);
   }
 }
 
 string16 SigninGlobalError::GetBubbleViewCancelButtonLabel() {
   return string16();
 }
 
 void SigninGlobalError::OnBubbleViewDidClose(Browser* browser) {
 }
 
 void SigninGlobalError::BubbleViewAcceptButtonPressed(Browser* browser) {
   ExecuteMenuItem(browser);
 }
 
 void SigninGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
   NOTREACHED();
 }