ui/base/cocoa/menu_controller.mm - 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: ui/base/cocoa/menu_controller.mm

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: ui/base/cocoa/menu_controller.mm

diff --git a/ui/base/cocoa/menu_controller.mm b/ui/base/cocoa/menu_controller.mm

index ebec346bc0b45253e9f7d58a92a25fa504b2ad8c..c7b8dff2fa3c8b1000360ec9dfbd1445826296bc 100644

--- a/ui/base/cocoa/menu_controller.mm

+++ b/ui/base/cocoa/menu_controller.mm

@@ -11,9 +11,9 @@

#import "ui/base/cocoa/cocoa_event_utils.h"

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

#include "ui/base/models/simple_menu_model.h"

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

#include "ui/gfx/font.h"

#include "ui/gfx/image/image.h"

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

@interface MenuController (Private)

- (void)addSeparatorToMenu:(NSMenu*)menu

@@ -30,7 +30,7 @@

NSFont* nsfont = [NSFont menuBarFontOfSize:0]; // 0 means "default"

gfx::Font font(base::SysNSStringToUTF8([nsfont fontName]),

static_cast<int>([nsfont pointSize]));

- return ui::ElideText(title, font, width, ui::ELIDE_AT_END);

+ return gfx::ElideText(title, font, width, gfx::ELIDE_AT_END);

}

- (id)init {

« no previous file with comments | « printing/printed_document.cc ('k') | ui/base/text/text_elider.cc » ('j') | no next file with comments »