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

Unified Diff: chrome/browser/ui/gtk/gtk_util.cc

Issue 7669040: content: Move render_widget_host_view_gtk to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix. Created 9 years, 4 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/gtk_theme_service.h ('k') | chrome/browser/ui/gtk/infobars/infobar_container_gtk.h » ('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 2fec73564c1aabef643da7f8f25b39342e5b2737..2a8160d957b2aa6503a83edaf584a3e6deb0fee8 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -37,6 +37,7 @@
#include "third_party/skia/include/core/SkColor.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/gtk_util.h"
#include "ui/gfx/image/image.h"
@@ -780,7 +781,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(l10n_util::TruncateString(
+ std::string truncated_url = UTF16ToUTF8(ui::TruncateString(
UTF8ToUTF16(url_str), kMaxTooltipURLLength));
gchar* escaped_url_cstr = g_markup_escape_text(truncated_url.c_str(),
truncated_url.size());
@@ -791,7 +792,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(l10n_util::TruncateString(
+ std::string truncated_title = UTF16ToUTF8(ui::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/gtk_theme_service.h ('k') | chrome/browser/ui/gtk/infobars/infobar_container_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698