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

Side by Side Diff: chrome/browser/ui/cocoa/download/download_item_button.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/download/download_item_button.h" 5 #import "chrome/browser/ui/cocoa/download/download_item_button.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 #import "chrome/browser/ui/cocoa/download/download_item_cell.h" 9 #import "chrome/browser/ui/cocoa/download/download_item_cell.h"
10 #import "chrome/browser/ui/cocoa/download/download_item_controller.h" 10 #import "chrome/browser/ui/cocoa/download/download_item_controller.h"
(...skipping 16 matching lines...) Expand all
27 - (void)mouseDown:(NSEvent*)event { 27 - (void)mouseDown:(NSEvent*)event {
28 DCHECK(controller_); 28 DCHECK(controller_);
29 // Override so that we can pop up a context menu on mouse down. 29 // Override so that we can pop up a context menu on mouse down.
30 NSCell* cell = [self cell]; 30 NSCell* cell = [self cell];
31 DCHECK([cell respondsToSelector:@selector(isMouseOverButtonPart)]); 31 DCHECK([cell respondsToSelector:@selector(isMouseOverButtonPart)]);
32 if ([reinterpret_cast<DownloadItemCell*>(cell) isMouseOverButtonPart]) { 32 if ([reinterpret_cast<DownloadItemCell*>(cell) isMouseOverButtonPart]) {
33 [self.draggableButton mouseDownImpl:event]; 33 [self.draggableButton mouseDownImpl:event];
34 } else { 34 } else {
35 // Hold a reference to our controller in case the download completes and we 35 // Hold a reference to our controller in case the download completes and we
36 // represent a file that's auto-removed (e.g. a theme). 36 // represent a file that's auto-removed (e.g. a theme).
37 scoped_nsobject<DownloadItemController> ref([controller_ retain]); 37 base::scoped_nsobject<DownloadItemController> ref([controller_ retain]);
38 [cell setHighlighted:YES]; 38 [cell setHighlighted:YES];
39 [[self menu] setDelegate:self]; 39 [[self menu] setDelegate:self];
40 [NSMenu popUpContextMenu:[self menu] 40 [NSMenu popUpContextMenu:[self menu]
41 withEvent:[NSApp currentEvent] 41 withEvent:[NSApp currentEvent]
42 forView:self]; 42 forView:self];
43 } 43 }
44 } 44 }
45 45
46 // Override to retain the controller, in case a closure is pumped that deletes 46 // Override to retain the controller, in case a closure is pumped that deletes
47 // the DownloadItemController while the menu is open <http://crbug.com/129826>. 47 // the DownloadItemController while the menu is open <http://crbug.com/129826>.
48 - (void)rightMouseDown:(NSEvent*)event { 48 - (void)rightMouseDown:(NSEvent*)event {
49 scoped_nsobject<DownloadItemController> ref([controller_ retain]); 49 base::scoped_nsobject<DownloadItemController> ref([controller_ retain]);
50 [super rightMouseDown:event]; 50 [super rightMouseDown:event];
51 } 51 }
52 52
53 - (void)menuDidClose:(NSMenu*)menu { 53 - (void)menuDidClose:(NSMenu*)menu {
54 [[self cell] setHighlighted:NO]; 54 [[self cell] setHighlighted:NO];
55 } 55 }
56 56
57 - (BOOL)shouldDelayWindowOrderingForEvent:(NSEvent*)event { 57 - (BOOL)shouldDelayWindowOrderingForEvent:(NSEvent*)event {
58 return YES; 58 return YES;
59 } 59 }
60 60
61 @end 61 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698