chrome/browser/ui/cocoa/menu_button.mm - Issue 17627005: mac: Remove unused includes of scoped_nsobject.h.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/cocoa/menu_button.mm

Issue 17627005: mac: Remove unused includes of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: builds Created 7 years, 6 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 | « chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h ('k') | chrome/browser/ui/cocoa/notifications/balloon_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 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/menu_button.h"	5 #import "chrome/browser/ui/cocoa/menu_button.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/mac/scoped_nsobject.h"

9 #import "chrome/browser/ui/cocoa/clickhold_button_cell.h"	8 #import "chrome/browser/ui/cocoa/clickhold_button_cell.h"

10 #import "chrome/browser/ui/cocoa/nsview_additions.h"	9 #import "chrome/browser/ui/cocoa/nsview_additions.h"

11	10

12 @interface MenuButton (Private)	11 @interface MenuButton (Private)

13 - (void)showMenu:(BOOL)isDragging;	12 - (void)showMenu:(BOOL)isDragging;

14 - (void)clickShowMenu:(id)sender;	13 - (void)clickShowMenu:(id)sender;

15 - (void)dragShowMenu:(id)sender;	14 - (void)dragShowMenu:(id)sender;

16 @end // @interface MenuButton (Private)	15 @end // @interface MenuButton (Private)

17	16

18 @implementation MenuButton	17 @implementation MenuButton

(...skipping 155 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
174 }	173 }

175	174

176 // Called when the button is clicked and dragged/held.	175 // Called when the button is clicked and dragged/held.

177 - (void)dragShowMenu:(id)sender {	176 - (void)dragShowMenu:(id)sender {

178 // We shouldn't get here unless the menu is enabled.	177 // We shouldn't get here unless the menu is enabled.

179 DCHECK([self attachedMenu]);	178 DCHECK([self attachedMenu]);

180 [self showMenu:YES];	179 [self showMenu:YES];

181 }	180 }

182	181

183 @end // @implementation MenuButton (Private)	182 @end // @implementation MenuButton (Private)

OLD	NEW