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

Side by Side Diff: chrome/browser/app_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: Fix gypi Created 7 years, 3 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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/mac/scoped_nsobject.h" 13 #include "base/mac/scoped_nsobject.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "base/prefs/pref_change_registrar.h" 16 #include "base/prefs/pref_change_registrar.h"
17 #include "ui/base/work_area_watcher_observer.h" 17 #include "ui/base/work_area_watcher_observer.h"
18 18
19 class AppControllerProfileObserver; 19 class AppControllerProfileObserver;
20 @class AppShimMenuController;
20 class BookmarkMenuBridge; 21 class BookmarkMenuBridge;
21 class CommandUpdater; 22 class CommandUpdater;
22 class GURL; 23 class GURL;
23 class HistoryMenuBridge; 24 class HistoryMenuBridge;
24 class Profile; 25 class Profile;
25 @class ProfileMenuController; 26 @class ProfileMenuController;
26 namespace ui { 27 namespace ui {
27 class WorkAreaWatcherObserver; 28 class WorkAreaWatcherObserver;
28 } 29 }
29 30
(...skipping 12 matching lines...) Expand all
42 43
43 // The ProfileObserver observes the ProfileInfoCache and gets notified 44 // The ProfileObserver observes the ProfileInfoCache and gets notified
44 // when a profile has been deleted. 45 // when a profile has been deleted.
45 scoped_ptr<AppControllerProfileObserver> profileInfoCacheObserver_; 46 scoped_ptr<AppControllerProfileObserver> profileInfoCacheObserver_;
46 47
47 // Management of the bookmark menu which spans across all windows 48 // Management of the bookmark menu which spans across all windows
48 // (and Browser*s). 49 // (and Browser*s).
49 scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_; 50 scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_;
50 scoped_ptr<HistoryMenuBridge> historyMenuBridge_; 51 scoped_ptr<HistoryMenuBridge> historyMenuBridge_;
51 52
53 // Controller that manages main menu items for packaged apps.
54 base::scoped_nsobject<AppShimMenuController> appShimMenuController_;
55
52 // The profile menu, which appears right before the Help menu. It is only 56 // The profile menu, which appears right before the Help menu. It is only
53 // available when multiple profiles is enabled. 57 // available when multiple profiles is enabled.
54 base::scoped_nsobject<ProfileMenuController> profileMenuController_; 58 base::scoped_nsobject<ProfileMenuController> profileMenuController_;
55 59
56 // If we're told to open URLs (in particular, via |-application:openFiles:| by 60 // If we're told to open URLs (in particular, via |-application:openFiles:| by
57 // Launch Services) before we've launched the browser, we queue them up in 61 // Launch Services) before we've launched the browser, we queue them up in
58 // |startupUrls_| so that they can go in the first browser window/tab. 62 // |startupUrls_| so that they can go in the first browser window/tab.
59 std::vector<GURL> startupUrls_; 63 std::vector<GURL> startupUrls_;
60 BOOL startupComplete_; 64 BOOL startupComplete_;
61 65
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 namespace app_controller_mac { 140 namespace app_controller_mac {
137 141
138 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in 142 // 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 143 // SessionService::Observe() to get around windows/linux and mac having
140 // different models of application lifetime. 144 // different models of application lifetime.
141 bool IsOpeningNewWindow(); 145 bool IsOpeningNewWindow();
142 146
143 } // namespace app_controller_mac 147 } // namespace app_controller_mac
144 148
145 #endif 149 #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