Suppress bubble view for CONNECTION_FAILED error

chrome/browser/sync/sync_ui_util.cc

 // Copyright (c) 2011 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/sync/sync_ui_util.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 322 matching lines @@
 
 MessageType GetStatusLabelsForNewTabPage(ProfileSyncService* service,
                                          string16* status_label,
                                          string16* link_label) {
   DCHECK(status_label);
   DCHECK(link_label);
   return sync_ui_util::GetStatusInfoForNewTabPage(
       service, status_label, link_label);
 }
 
-MessageType GetStatusLabelsForSyncGlobalError(ProfileSyncService* service,
-                                              string16* menu_label,
-                                              string16* bubble_message,
-                                              string16* bubble_accept_label) {
+void GetStatusLabelsForSyncGlobalError(ProfileSyncService* service,
+                                       string16* menu_label,
+                                       string16* bubble_message,
+                                       string16* bubble_accept_label) {
+  DCHECK(menu_label);
+  DCHECK(bubble_message);
+  DCHECK(bubble_accept_label);
+

[Andrew T Wilson (Slow), 2011/10/17 04:08:55]

Since we aren't returning MessageType any more, I think you need to clear out
menu_label, etc here.

[sail, 2011/10/17 15:21:22]

Done.

   if (!service->HasSyncSetupCompleted())
-    return PRE_SYNCED;
+    return;
 
   if (service->IsPassphraseRequired() &&
       service->IsPassphraseRequiredForDecryption()) {
     // This is not the first machine so ask user to enter passphrase.
-    if (menu_label) {
-      *menu_label = l10n_util::GetStringUTF16(
-          IDS_SYNC_PASSPHRASE_ERROR_WRENCH_MENU_ITEM);
-    }
-    if (bubble_message) {
-      string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
-      *bubble_message = l10n_util::GetStringFUTF16(
-          IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE, product_name);
-    }
-    if (bubble_accept_label) {
-      *bubble_accept_label = l10n_util::GetStringUTF16(
-          IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_ACCEPT);
-    }
-    return SYNC_ERROR;
+    *menu_label = l10n_util::GetStringUTF16(
+        IDS_SYNC_PASSPHRASE_ERROR_WRENCH_MENU_ITEM);
+    string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
+    *bubble_message = l10n_util::GetStringFUTF16(
+        IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE, product_name);
+    *bubble_accept_label = l10n_util::GetStringUTF16(
+        IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_ACCEPT);
+    return;
   }
 
   MessageType status = GetStatus(service);
   if (status != SYNC_ERROR)
-    return status;
+    return;
 
   const AuthError& auth_error = service->GetAuthError();
   if (auth_error.state() != AuthError::NONE) {
     GetStatusLabelsForAuthError(auth_error, *service, NULL, NULL,
         menu_label, bubble_message, bubble_accept_label);
-    return SYNC_ERROR;
   }
-
-  return SYNCED;
 }
 
 MessageType GetStatus(ProfileSyncService* service) {
   return sync_ui_util::GetStatusInfo(service, NULL, NULL);
 }
 
 bool ShouldShowSyncErrorButton(ProfileSyncService* service) {
   return service &&
          ((!service->IsManaged() &&
            service->HasSyncSetupCompleted()) &&
@@ skipping 266 matching lines @@
         DictionaryValue* val = new DictionaryValue;
         val->SetString("model_type", ModelTypeToString(it->first));
         val->SetString("group", ModelSafeGroupToString(it->second));
         routing_info->Append(val);
       }
     }
   }
 }
 
 }  // namespace sync_ui_util