From 62cfbad7377b4db2497fec6e88821a36a1b767fe Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Mon, 22 Aug 2011 22:26:53 +0000 Subject: (shlib failure) Revert 97750 - content: Move render_widget_host_view_gtk to content/ This also moves some other files: - OwnedWidgetGtk now goes in ui/base/gtk/ - TruncateString moved from l10n_util:: to ui:: - GtkIMContextWrapper has part of its code split into chrome/ (IDC using code goes in RenderViewContextMenu) and the rest go in content/ (gtk using code goes with GtkIMContextWrapper). - gtk_key_bindings_handler[_unittest] now goes in content, as it's a utility class to RenderWidgetHostGtk. BUG=93804 TEST=existing unit tests Review URL: http://codereview.chromium.org/7669040 TBR=erg@google.com Review URL: http://codereview.chromium.org/7708017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97756 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/gtk/gtk_util.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to '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 2a8160d..2fec735 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -37,7 +37,6 @@ #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" @@ -781,7 +780,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(l10n_util::TruncateString( UTF8ToUTF16(url_str), kMaxTooltipURLLength)); gchar* escaped_url_cstr = g_markup_escape_text(truncated_url.c_str(), truncated_url.size()); @@ -792,7 +791,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(l10n_util::TruncateString( title, kMaxTooltipTitleLength)); gchar* escaped_title_cstr = g_markup_escape_text(truncated_title.c_str(), truncated_title.size()); -- cgit v1.1