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

Unified Diff: chrome/browser/ui/gtk/gtk_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/ui/gtk/global_history_menu.cc ('k') | chrome/browser/ui/gtk/status_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/gtk_util.cc
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index 2b51a0abf9f68a73dcd43d7af4f5110bdb0c26e5..36cddb7125b36204f305788982fb7456a958e27c 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -40,11 +40,11 @@
#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/base/x/x11_util.h"
#include "ui/gfx/image/cairo_cached_surface.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/pango_util.h"
+#include "ui/gfx/text_elider.h"
#include "url/gurl.h"
// These conflict with base/tracked_objects.h, so need to come last.
@@ -648,7 +648,7 @@ std::string BuildTooltipTitleFor(string16 title, const GURL& url) {
const std::string& url_str = url.possibly_invalid_spec();
const std::string& title_str = UTF16ToUTF8(title);
- std::string truncated_url = UTF16ToUTF8(ui::TruncateString(
+ std::string truncated_url = UTF16ToUTF8(gfx::TruncateString(
UTF8ToUTF16(url_str), kMaxTooltipURLLength));
gchar* escaped_url_cstr = g_markup_escape_text(truncated_url.c_str(),
truncated_url.size());
@@ -658,7 +658,7 @@ std::string BuildTooltipTitleFor(string16 title, const GURL& url) {
if (url_str == title_str || title.empty()) {
return escaped_url;
} else {
- std::string truncated_title = UTF16ToUTF8(ui::TruncateString(
+ std::string truncated_title = UTF16ToUTF8(gfx::TruncateString(
title, kMaxTooltipTitleLength));
gchar* escaped_title_cstr = g_markup_escape_text(truncated_title.c_str(),
truncated_title.size());
« no previous file with comments | « chrome/browser/ui/gtk/global_history_menu.cc ('k') | chrome/browser/ui/gtk/status_bubble_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698