[Sync Setup UI] Fix display of "Last Synced as..." in Personal Stuff.

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 155 matching lines @@
         // NOT first machine.
         // Show a link ("needs attention"), but still indicate the
         // current synced status.  Return SYNC_PROMO so that
         // the configure link will still be shown.
         if (status_label && link_label) {
           status_label->assign(GetSyncedStateStatusLabel(service));
           link_label->assign(
               l10n_util::GetStringUTF16(IDS_SYNC_PASSWORD_SYNC_ATTENTION));
         }
         return SYNC_PROMO;
-      } else {
-        // First machine.  Don't show promotion, just show everything
-        // normal.
-        if (status_label)
-          status_label->assign(GetSyncedStateStatusLabel(service));
-        return SYNCED;
       }
     }
+

[lipalani1, 2011/09/22 20:20:22]

I dont think the comment is still valid.

+    // First machine, or there is no error. Don't show promotion, just show
+    // everything normal.
+    if (status_label)
+      status_label->assign(GetSyncedStateStatusLabel(service));
     return SYNCED;
   } else {
     // Either show auth error information with a link to re-login, auth in prog,
     // or provide a link to continue with setup.
     result_type = PRE_SYNCED;
     if (service->SetupInProgress()) {
       ProfileSyncService::Status status(service->QueryDetailedSyncStatus());
       const AuthError& auth_error = service->GetAuthError();
       if (status_label) {
         status_label->assign(
@@ skipping 354 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