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

Side by Side Diff: chrome/browser/app_controller_mac.h

Issue 18089012: Swap main menu with app-specific menu when app window focused. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 7 years, 5 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 | « no previous file | chrome/browser/app_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 (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 #ifndef CHROME_BROWSER_APP_CONTROLLER_MAC_H_ 5 #ifndef CHROME_BROWSER_APP_CONTROLLER_MAC_H_
6 #define CHROME_BROWSER_APP_CONTROLLER_MAC_H_ 6 #define CHROME_BROWSER_APP_CONTROLLER_MAC_H_
7 7
8 #if defined(__OBJC__) 8 #if defined(__OBJC__)
9 9
10 #import <Cocoa/Cocoa.h> 10 #import <Cocoa/Cocoa.h>
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 IBOutlet NSMenuItem* tabposeMenuItem_; 74 IBOutlet NSMenuItem* tabposeMenuItem_;
75 75
76 // Indicates wheter an NSPopover is currently being shown. 76 // Indicates wheter an NSPopover is currently being shown.
77 BOOL hasPopover_; 77 BOOL hasPopover_;
78 78
79 // Observers that listen to the work area changes. 79 // Observers that listen to the work area changes.
80 ObserverList<ui::WorkAreaWatcherObserver> workAreaChangeObservers_; 80 ObserverList<ui::WorkAreaWatcherObserver> workAreaChangeObservers_;
81 81
82 scoped_ptr<PrefChangeRegistrar> profilePrefRegistrar_; 82 scoped_ptr<PrefChangeRegistrar> profilePrefRegistrar_;
83 PrefChangeRegistrar localPrefRegistrar_; 83 PrefChangeRegistrar localPrefRegistrar_;
84
85 // The main menu item showing the name of a currently focused packaged app.
86 base::scoped_nsobject<NSMenuItem> appMenuItem_;
84 } 87 }
85 88
86 @property(readonly, nonatomic) BOOL startupComplete; 89 @property(readonly, nonatomic) BOOL startupComplete;
87 @property(readonly, nonatomic) Profile* lastProfile; 90 @property(readonly, nonatomic) Profile* lastProfile;
88 91
89 - (void)didEndMainMessageLoop; 92 - (void)didEndMainMessageLoop;
90 93
91 // Try to close all browser windows, and if that succeeds then quit. 94 // Try to close all browser windows, and if that succeeds then quit.
92 - (BOOL)tryToTerminateApplication:(NSApplication*)app; 95 - (BOOL)tryToTerminateApplication:(NSApplication*)app;
93 96
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 namespace app_controller_mac { 139 namespace app_controller_mac {
137 140
138 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in 141 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in
139 // SessionService::Observe() to get around windows/linux and mac having 142 // SessionService::Observe() to get around windows/linux and mac having
140 // different models of application lifetime. 143 // different models of application lifetime.
141 bool IsOpeningNewWindow(); 144 bool IsOpeningNewWindow();
142 145
143 } // namespace app_controller_mac 146 } // namespace app_controller_mac
144 147
145 #endif 148 #endif
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/app_controller_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698