chrome/browser/ui/cocoa/apps/app_menu_controller_mac.h - Issue 22867009: Swap main menu with app-specific menu when app window focused.

Side by Side Diff: chrome/browser/ui/cocoa/apps/app_menu_controller_mac.h

Issue 22867009: Swap main menu with app-specific menu when app window focused. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Missed something in rebase. Created 7 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

« chrome/browser/app_controller_mac.h ('K') | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/ui/cocoa/apps/app_menu_controller_mac.mm » ('j') | chrome/browser/ui/cocoa/apps/app_menu_controller_mac.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	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

	3 // found in the LICENSE file.

	4

	5 #ifndef CHROME_BROWSER_UI_COCOA_APPS_APP_MENU_CONTROLLER_MAC_H_

	6 #define CHROME_BROWSER_UI_COCOA_APPS_APP_MENU_CONTROLLER_MAC_H_

	7

	8 #import <Cocoa/Cocoa.h>

	9

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

	11

	12 // This controller listens to NSWindowDidBecomeMainNotification and

	13 // NSWindowDidResignMainNotification and modifies the main menu bar to mimic a

	14 // main menu for the app. When an app window becomes main, all Chrome menu items

	15 // are hidden and menu items for the app are appended to the main menu. When the

	16 // app window resigns main, its menu items are removed and all Chrome menu items

	17 // are unhidden.

	18 @interface AppMenuController : NSObject {

	19 @private

	20 // The extension id of the currently focused packaged app.

	21 base::scoped_nsobject<NSString> appId_;

	22 // A menu item for the currently focused packaged app.

	23 base::scoped_nsobject<NSMenuItem> appMenuItem_;

	24 }

	25

	26 - (void)unregisterEventHandlers;
	Robert Sesek 2013/08/21 14:21:49 nit: please document. Is this unnecessary if you j nit: please document. Is this unnecessary if you just do it in -dealloc? jackhou1 2013/08/21 23:54:48 It's called in AppController-applicationWillTermin Show quoted text On 2013/08/21 14:21:49, rsesek wrote: > nit: please document. Is this unnecessary if you just do it in -dealloc? It's called in AppController-applicationWillTerminate. tapted@ suggested having this so that unregistering is explicit since appMenuController_.reset() does not dealloc immediately. tapted 2013/08/22 00:27:02 Hehe - dealing with weird OjbC lifetime issues in Show quoted text On 2013/08/21 23:54:48, jackhou1 wrote: > On 2013/08/21 14:21:49, rsesek wrote: > > nit: please document. Is this unnecessary if you just do it in -dealloc? > > It's called in AppController-applicationWillTerminate. tapted@ suggested having > this so that unregistering is explicit since appMenuController_.reset() does not > dealloc immediately. Hehe - dealing with weird OjbC lifetime issues in UI code may have made me overly paranoid ;). dealloc should be safe here, since nothing else should be retaining the AppMenuController. And probably better, since NSNotificationCenter doesn't retain observers so unregistering in dealloc makes it clearer we are avoiding zombie observers. jackhou1 2013/08/22 01:44:02 Done. Show quoted text On 2013/08/22 00:27:02, tapted wrote: > On 2013/08/21 23:54:48, jackhou1 wrote: > > On 2013/08/21 14:21:49, rsesek wrote: > > > nit: please document. Is this unnecessary if you just do it in -dealloc? > > > > It's called in AppController-applicationWillTerminate. tapted@ suggested > having > > this so that unregistering is explicit since appMenuController_.reset() does > not > > dealloc immediately. > > Hehe - dealing with weird OjbC lifetime issues in UI code may have made me > overly paranoid ;). dealloc should be safe here, since nothing else should be > retaining the AppMenuController. And probably better, since NSNotificationCenter > doesn't retain observers so unregistering in dealloc makes it clearer we are > avoiding zombie observers. Done.
	27

	28 @end

	29

	30 #endif // CHROME_BROWSER_UI_COCOA_APPS_APP_MENU_CONTROLLER_MAC_H_

OLD	NEW