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

Unified Diff: chrome/browser/ui/gtk/avatar_menu_item_gtk.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
Index: chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
diff --git a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
index 791cd427a211f5846c2344d2dc64e870e7f045a0..aabd4908b5158395ab10f093f6afbf47fa9dae4c 100644
--- a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
+++ b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc
@@ -20,10 +20,10 @@
#include "ui/base/gtk/gtk_hig_constants.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/text/text_elider.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/gtk_util.h"
#include "ui/gfx/image/image.h"
+#include "ui/gfx/text_elider.h"
namespace {
@@ -227,10 +227,10 @@ void AvatarMenuItemGtk::Init(GtkThemeService* theme_service) {
// The user name label.
GtkWidget* item_vbox = gtk_vbox_new(FALSE, 0);
GtkWidget* name_label = NULL;
- string16 elided_name = ui::ElideText(item_.name,
+ string16 elided_name = gfx::ElideText(item_.name,
gfx::Font(),
kUserNameMaxWidth,
- ui::ELIDE_AT_END);
+ gfx::ELIDE_AT_END);
name_label = theme_service->BuildLabel(UTF16ToUTF8(elided_name),
ui::kGdkBlack);
« no previous file with comments | « chrome/browser/ui/external_protocol_dialog_delegate.cc ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698