Move text_elider to gfx.

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/signin_global_error.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sync_global_error.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/text_elider.h"
 
 namespace {
 // Maximum width of a username - we trim emails that are wider than this so
 // the wrench menu doesn't get ridiculously wide.
 const int kUsernameMaxWidth = 200;
 }  // namespace
 
 namespace signin_ui_util {
 
 GlobalError* GetSignedInServiceError(Profile* profile) {
@@ skipping 37 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()) {
-      string16 elided_username = ui::ElideEmail(UTF8ToUTF16(username),
+      string16 elided_username = gfx::ElideEmail(UTF8ToUTF16(username),
                                                 gfx::Font(),
                                                 kUsernameMaxWidth);
       return l10n_util::GetStringFUTF16(IDS_SYNC_MENU_SYNCED_LABEL,
                                         elided_username);
     }
   }
   return l10n_util::GetStringFUTF16(IDS_SYNC_MENU_PRE_SYNCED_LABEL,
       l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
 }
 
@@ skipping 51 matching lines @@
     default:
       if (status_label) {
         status_label->assign(l10n_util::GetStringUTF16(
             IDS_SYNC_ERROR_SIGNING_IN));
       }
       break;
   }
 }
 
 }  // namespace signin_ui_util