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

Unified Diff: chrome/browser/ui/gtk/bookmarks/bookmark_utils_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
« no previous file with comments | « chrome/browser/ui/gtk/avatar_menu_item_gtk.cc ('k') | chrome/browser/ui/gtk/content_setting_bubble_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
index 8b9ab4ab8f2cb1da894cb33a1bf306a94f59e0d9..1697fe9f15b24ef96ba3bbb8d2a27dca4721d75e 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
@@ -25,10 +25,10 @@
#include "ui/base/gtk/gtk_screen_util.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_skia_paint.h"
#include "ui/gfx/font.h"
#include "ui/gfx/image/image.h"
+#include "ui/gfx/text_elider.h"
namespace {
@@ -277,10 +277,10 @@ std::string BuildMenuLabelFor(const BookmarkNode* node) {
// This breaks on word boundaries. Ideally we would break on character
// boundaries.
std::string elided_name = UTF16ToUTF8(
- ui::TruncateString(node->GetTitle(), kMaxCharsOnAMenuLabel));
+ gfx::TruncateString(node->GetTitle(), kMaxCharsOnAMenuLabel));
if (elided_name.empty()) {
- elided_name = UTF16ToUTF8(ui::TruncateString(
+ elided_name = UTF16ToUTF8(gfx::TruncateString(
UTF8ToUTF16(node->url().possibly_invalid_spec()),
kMaxCharsOnAMenuLabel));
}
« no previous file with comments | « chrome/browser/ui/gtk/avatar_menu_item_gtk.cc ('k') | chrome/browser/ui/gtk/content_setting_bubble_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698