chrome/browser/ui/gtk/global_history_menu.cc - Issue 23731010: Move text_elider to gfx.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/global_history_menu.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:

Index: chrome/browser/ui/gtk/global_history_menu.cc

diff --git a/chrome/browser/ui/gtk/global_history_menu.cc b/chrome/browser/ui/gtk/global_history_menu.cc

index 005464114d00d2734e68a6d31add42f34767fa6d..9235762b8769cb66427aedd537727463ca6af49b 100644

--- a/chrome/browser/ui/gtk/global_history_menu.cc

+++ b/chrome/browser/ui/gtk/global_history_menu.cc

@@ -29,9 +29,9 @@

#include "grit/generated_resources.h"

#include "ui/base/gtk/owned_widget_gtk.h"

#include "ui/base/l10n/l10n_util.h"

-#include "ui/base/text/text_elider.h"

#include "ui/gfx/codec/png_codec.h"

#include "ui/gfx/gtk_util.h"

+#include "ui/gfx/text_elider.h"

using content::OpenURLParams;

@@ -198,7 +198,7 @@ GtkWidget* GlobalHistoryMenu::AddHistoryItemToMenu(HistoryItem* item,

if (title.empty())

title = UTF8ToUTF16(url_string);

- ui::ElideString(title, kMaximumMenuWidthInChars, &title);

+ gfx::ElideString(title, kMaximumMenuWidthInChars, &title);

GtkWidget* menu_item = gtk_menu_item_new_with_label(

UTF16ToUTF8(title).c_str());