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

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

Issue 898543008: Fixed "Close Window" shortcut in File Menu for Hosted/Packaged apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 5 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 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 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 #ifndef CHROME_BROWSER_UI_COCOA_APPS_APP_SHIM_MENU_CONTROLLER_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_APPS_APP_SHIM_MENU_CONTROLLER_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_APPS_APP_SHIM_MENU_CONTROLLER_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_APPS_APP_SHIM_MENU_CONTROLLER_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 11
12 @class DoppelgangerMenuItem; 12 @class DoppelgangerMenuItem;
13 13
14 // This controller listens to NSWindowDidBecomeMainNotification and 14 // This controller listens to NSWindowDidBecomeMainNotification and
15 // NSWindowDidResignMainNotification and modifies the main menu bar to mimic a 15 // NSWindowDidResignMainNotification and modifies the main menu bar to mimic a
16 // main menu for the app. When an app window becomes main, all Chrome menu items 16 // main menu for the app. When an app window becomes main, all Chrome menu items
17 // are hidden and menu items for the app are appended to the main menu. When the 17 // are hidden and menu items for the app are appended to the main menu. When the
18 // app window resigns main, its menu items are removed and all Chrome menu items 18 // app window resigns main, its menu items are removed and all Chrome menu items
19 // are unhidden. 19 // are unhidden.
20 @interface AppShimMenuController : NSObject { 20 @interface AppShimMenuController : NSObject {
21 @private 21 @private
22 // The extension id of the currently focused packaged app. 22 // The extension id of the currently focused packaged app.
23 base::scoped_nsobject<NSString> appId_; 23 base::scoped_nsobject<NSString> appId_;
24 // Items that need a doppelganger. 24 // Items that need a doppelganger.
25 base::scoped_nsobject<DoppelgangerMenuItem> aboutDoppelganger_; 25 base::scoped_nsobject<DoppelgangerMenuItem> aboutDoppelganger_;
26 base::scoped_nsobject<DoppelgangerMenuItem> hideDoppelganger_; 26 base::scoped_nsobject<DoppelgangerMenuItem> hideDoppelganger_;
27 base::scoped_nsobject<DoppelgangerMenuItem> quitDoppelganger_; 27 base::scoped_nsobject<DoppelgangerMenuItem> quitDoppelganger_;
28 base::scoped_nsobject<DoppelgangerMenuItem> newDoppelganger_; 28 base::scoped_nsobject<DoppelgangerMenuItem> newDoppelganger_;
29 base::scoped_nsobject<DoppelgangerMenuItem> openDoppelganger_; 29 base::scoped_nsobject<DoppelgangerMenuItem> openDoppelganger_;
30 base::scoped_nsobject<DoppelgangerMenuItem> closeWindowDoppelganger_;
30 base::scoped_nsobject<DoppelgangerMenuItem> allToFrontDoppelganger_; 31 base::scoped_nsobject<DoppelgangerMenuItem> allToFrontDoppelganger_;
31 // Menu items for the currently focused packaged app. 32 // Menu items for the currently focused packaged app.
32 base::scoped_nsobject<NSMenuItem> appMenuItem_; 33 base::scoped_nsobject<NSMenuItem> appMenuItem_;
33 base::scoped_nsobject<NSMenuItem> fileMenuItem_; 34 base::scoped_nsobject<NSMenuItem> fileMenuItem_;
34 base::scoped_nsobject<NSMenuItem> editMenuItem_; 35 base::scoped_nsobject<NSMenuItem> editMenuItem_;
35 base::scoped_nsobject<NSMenuItem> windowMenuItem_; 36 base::scoped_nsobject<NSMenuItem> windowMenuItem_;
36 // Additional menu items for hosted apps. 37 // Additional menu items for hosted apps.
37 base::scoped_nsobject<NSMenuItem> viewMenuItem_; 38 base::scoped_nsobject<NSMenuItem> viewMenuItem_;
38 base::scoped_nsobject<NSMenuItem> historyMenuItem_; 39 base::scoped_nsobject<NSMenuItem> historyMenuItem_;
39 } 40 }
40 41
41 @end 42 @end
42 43
43 #endif // CHROME_BROWSER_UI_COCOA_APPS_APP_SHIM_MENU_CONTROLLER_MAC_H_ 44 #endif // CHROME_BROWSER_UI_COCOA_APPS_APP_SHIM_MENU_CONTROLLER_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698