Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1312)

Unified Diff: chrome/browser/signin/signin_ui_util.cc

Issue 23731010: Move text_elider to gfx. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update3 Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/menu_manager.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/signin_ui_util.cc
diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc
index e3bb8ba503dc60c0c2981d8d5ff580eea2c75691..b458b2a0184338b9b1f72d17f2625b46fa38bc6f 100644
--- a/chrome/browser/signin/signin_ui_util.cc
+++ b/chrome/browser/signin/signin_ui_util.cc
@@ -16,8 +16,8 @@
#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
@@ -75,7 +75,7 @@ string16 GetSigninMenuLabel(Profile* 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,
« no previous file with comments | « chrome/browser/extensions/menu_manager.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698