diff options
| author | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 23:34:37 +0000 |
|---|---|---|
| committer | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 23:34:37 +0000 |
| commit | cf9995bcc40e8fd67551f660b7fe37cfd00b2c79 (patch) | |
| tree | f60576273e0a6b61b89b9fb678ea6491dea0d7cd /chrome | |
| parent | 3544b434280f752c4934346ce58adb5d2ea5e24b (diff) | |
| download | chromium_src-cf9995bcc40e8fd67551f660b7fe37cfd00b2c79.zip chromium_src-cf9995bcc40e8fd67551f660b7fe37cfd00b2c79.tar.gz chromium_src-cf9995bcc40e8fd67551f660b7fe37cfd00b2c79.tar.bz2 | |
Style fixes for previous review:
http://codereview.chromium.org/92062
I didn't make WebMenuRunner's menu_ a scoped_nsobject, because I'm not
sure how that will ever be released (~scoped_nsobject won't get called
from a Cocoa object's dealloc?).
Review URL: http://codereview.chromium.org/99088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_view_mac.mm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index da5347a..d6f67fe 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -282,18 +282,19 @@ void RenderWidgetHostViewMac::ShowPopupWithItems( bounds.width(), bounds.height()); // Display the menu. - WebMenuRunner* menu_runner = - [[[WebMenuRunner alloc] initWithItems:items] autorelease]; + scoped_nsobject<WebMenuRunner> menu_runner; + menu_runner.reset([[WebMenuRunner alloc] initWithItems:items]); [menu_runner runMenuInView:parent_view_ withBounds:position initialIndex:selected_item]; int window_num = [[parent_view_ window] windowNumber]; - NSEvent* event = CreateEventForMenuAction([menu_runner menuItemWasChosen], - window_num, item_height, - [menu_runner indexOfSelectedItem], - position, view_rect); + NSEvent* event = + webkit_glue::EventWithMenuAction([menu_runner menuItemWasChosen], + window_num, item_height, + [menu_runner indexOfSelectedItem], + position, view_rect); if ([menu_runner menuItemWasChosen]) { // Simulate a menu selection event. |