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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm

Issue 7465090: [Mac] Replace the custom bookmark menus with native NSMenus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h"
6 6
7 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
8 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
9
10 NSUInteger GetNumberOfMenuItems(BookmarkBarFolderController* folder) {
11 if (![folder menuBridge])
12 return 0;
13 return [[[[folder menuBridge]->controller() menu] itemArray] count];
14 }
15
16 void CloseFolderSoon(BookmarkBarFolderController* folder, NSTimeInterval when) {
17 NSArray* modes = [NSArray arrayWithObjects:NSDefaultRunLoopMode,
18 NSEventTrackingRunLoopMode, nil];
19 [folder performSelector:@selector(closeMenu)
20 withObject:nil
21 afterDelay:when
22 inModes:modes];
23 }
24
7 @interface NSArray (BookmarkBarUnitTestHelper) 25 @interface NSArray (BookmarkBarUnitTestHelper)
8 26
9 // A helper function for scanning an array of buttons looking for the 27 // A helper function for scanning an array of buttons looking for the
10 // button with the given |title|. 28 // button with the given |title|.
11 - (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title; 29 - (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title;
12 30
13 @end 31 @end
14 32
15 33
16 @implementation NSArray (BookmarkBarUnitTestHelper) 34 @implementation NSArray (BookmarkBarUnitTestHelper)
17 35
18 - (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title { 36 - (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title {
19 for (BookmarkButton* button in self) { 37 for (BookmarkButton* button in self) {
20 if ([[button title] isEqualToString:title]) 38 if ([[button title] isEqualToString:title])
21 return button; 39 return button;
22 } 40 }
23 return nil; 41 return nil;
24 } 42 }
25 43
26 @end 44 @end
27 45
28 @implementation BookmarkBarController (BookmarkBarUnitTestHelper) 46 @implementation BookmarkBarController (BookmarkBarUnitTestHelper)
29 47
30 - (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title { 48 - (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title {
31 return [[self buttons] buttonWithTitleEqualTo:title]; 49 return [[self buttons] buttonWithTitleEqualTo:title];
32 } 50 }
33 51
34 @end 52 @end
35 53
36 @implementation BookmarkBarFolderController(BookmarkBarUnitTestHelper)
37
38 - (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title {
39 return [[self buttons] buttonWithTitleEqualTo:title];
40 }
41
42 @end
43
44 @implementation BookmarkButton(BookmarkBarUnitTestHelper) 54 @implementation BookmarkButton(BookmarkBarUnitTestHelper)
45 55
46 - (NSPoint)center { 56 - (NSPoint)center {
47 NSRect frame = [self frame]; 57 NSRect frame = [self frame];
48 NSPoint center = NSMakePoint(NSMidX(frame), NSMidY(frame)); 58 NSPoint center = NSMakePoint(NSMidX(frame), NSMidY(frame));
49 center = [[self superview] convertPoint:center toView:nil]; 59 center = [[self superview] convertPoint:center toView:nil];
50 return center; 60 return center;
51 } 61 }
52 62
53 - (NSPoint)top { 63 - (NSPoint)top {
(...skipping 18 matching lines...) Expand all
72 } 82 }
73 83
74 - (NSPoint)right { 84 - (NSPoint)right {
75 NSRect frame = [self frame]; 85 NSRect frame = [self frame];
76 NSPoint right = NSMakePoint(NSMaxX(frame), NSMidY(frame)); 86 NSPoint right = NSMakePoint(NSMaxX(frame), NSMidY(frame));
77 right = [[self superview] convertPoint:right toView:nil]; 87 right = [[self superview] convertPoint:right toView:nil];
78 return right; 88 return right;
79 } 89 }
80 90
81 @end 91 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698