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

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « printing/printed_document.cc ('k') | ui/base/text/text_elider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ui/base/cocoa/menu_controller.h" 5 #import "ui/base/cocoa/menu_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/sys_string_conversions.h" 8 #include "base/strings/sys_string_conversions.h"
9 #include "ui/base/accelerators/accelerator.h" 9 #include "ui/base/accelerators/accelerator.h"
10 #include "ui/base/accelerators/platform_accelerator_cocoa.h" 10 #include "ui/base/accelerators/platform_accelerator_cocoa.h"
11 #import "ui/base/cocoa/cocoa_event_utils.h" 11 #import "ui/base/cocoa/cocoa_event_utils.h"
12 #include "ui/base/l10n/l10n_util_mac.h" 12 #include "ui/base/l10n/l10n_util_mac.h"
13 #include "ui/base/models/simple_menu_model.h" 13 #include "ui/base/models/simple_menu_model.h"
14 #include "ui/base/text/text_elider.h"
15 #include "ui/gfx/font.h" 14 #include "ui/gfx/font.h"
16 #include "ui/gfx/image/image.h" 15 #include "ui/gfx/image/image.h"
16 #include "ui/gfx/text_elider.h"
17 17
18 @interface MenuController (Private) 18 @interface MenuController (Private)
19 - (void)addSeparatorToMenu:(NSMenu*)menu 19 - (void)addSeparatorToMenu:(NSMenu*)menu
20 atIndex:(int)index; 20 atIndex:(int)index;
21 @end 21 @end
22 22
23 @implementation MenuController 23 @implementation MenuController
24 24
25 @synthesize model = model_; 25 @synthesize model = model_;
26 @synthesize useWithPopUpButtonCell = useWithPopUpButtonCell_; 26 @synthesize useWithPopUpButtonCell = useWithPopUpButtonCell_;
27 27
28 + (string16)elideMenuTitle:(const string16&)title 28 + (string16)elideMenuTitle:(const string16&)title
29 toWidth:(int)width { 29 toWidth:(int)width {
30 NSFont* nsfont = [NSFont menuBarFontOfSize:0]; // 0 means "default" 30 NSFont* nsfont = [NSFont menuBarFontOfSize:0]; // 0 means "default"
31 gfx::Font font(base::SysNSStringToUTF8([nsfont fontName]), 31 gfx::Font font(base::SysNSStringToUTF8([nsfont fontName]),
32 static_cast<int>([nsfont pointSize])); 32 static_cast<int>([nsfont pointSize]));
33 return ui::ElideText(title, font, width, ui::ELIDE_AT_END); 33 return gfx::ElideText(title, font, width, gfx::ELIDE_AT_END);
34 } 34 }
35 35
36 - (id)init { 36 - (id)init {
37 self = [super init]; 37 self = [super init];
38 return self; 38 return self;
39 } 39 }
40 40
41 - (id)initWithModel:(ui::MenuModel*)model 41 - (id)initWithModel:(ui::MenuModel*)model
42 useWithPopUpButtonCell:(BOOL)useWithCell { 42 useWithPopUpButtonCell:(BOOL)useWithCell {
43 if ((self = [super init])) { 43 if ((self = [super init])) {
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 } 236 }
237 237
238 - (void)menuDidClose:(NSMenu*)menu { 238 - (void)menuDidClose:(NSMenu*)menu {
239 if (isMenuOpen_) { 239 if (isMenuOpen_) {
240 model_->MenuClosed(); 240 model_->MenuClosed();
241 isMenuOpen_ = NO; 241 isMenuOpen_ = NO;
242 } 242 }
243 } 243 }
244 244
245 @end 245 @end
OLDNEW
« no previous file with comments | « printing/printed_document.cc ('k') | ui/base/text/text_elider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698