Add fade eliding for Views Labels; related cleanup.

chrome/browser/signin/signin_ui_util.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_ui_util.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ skipping 63 matching lines @@
 
   // Even if the user is signed in, don't display the "signed in as..."
   // label if we're still setting up sync.
   if (!service || !service->FirstSetupInProgress()) {
     std::string username;
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetForProfileIfExists(profile);
     if (signin_manager)
       username = signin_manager->GetAuthenticatedUsername();
     if (!username.empty() && !signin_manager->AuthInProgress()) {
-      base::string16 elided_username = gfx::ElideEmail(
-          base::UTF8ToUTF16(username), gfx::FontList(), kUsernameMaxWidth);
-      return l10n_util::GetStringFUTF16(IDS_SYNC_MENU_SYNCED_LABEL,
-                                        elided_username);
+      const base::string16 elided = gfx::ElideText(base::UTF8ToUTF16(username),
+          gfx::FontList(), kUsernameMaxWidth, gfx::ELIDE_EMAIL);
+      return l10n_util::GetStringFUTF16(IDS_SYNC_MENU_SYNCED_LABEL, elided);
     }
   }
   return l10n_util::GetStringFUTF16(IDS_SYNC_MENU_PRE_SYNCED_LABEL,
       l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
 }
 
 // Given an authentication state this helper function returns various labels
 // that can be used to display information about the state.
 void GetStatusLabelsForAuthError(Profile* profile,
                                  const SigninManagerBase& signin_manager,
@@ skipping 50 matching lines @@
     default:
       if (status_label) {
         status_label->assign(l10n_util::GetStringUTF16(
             IDS_SYNC_ERROR_SIGNING_IN));
       }
       break;
   }
 }
 
 }  // namespace signin_ui_util