| OLD | NEW |
| 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 10 matching lines...) Expand all Loading... |
| 21 class AppControllerProfileObserver; | 21 class AppControllerProfileObserver; |
| 22 @class AppShimMenuController; | 22 @class AppShimMenuController; |
| 23 class BookmarkMenuBridge; | 23 class BookmarkMenuBridge; |
| 24 class CommandUpdater; | 24 class CommandUpdater; |
| 25 class GURL; | 25 class GURL; |
| 26 class HandoffActiveURLObserverBridge; | 26 class HandoffActiveURLObserverBridge; |
| 27 @class HandoffManager; | 27 @class HandoffManager; |
| 28 class HistoryMenuBridge; | 28 class HistoryMenuBridge; |
| 29 class Profile; | 29 class Profile; |
| 30 @class ProfileMenuController; | 30 @class ProfileMenuController; |
| 31 @class ShareMenuController; |
| 31 class QuitWithAppsController; | 32 class QuitWithAppsController; |
| 32 | 33 |
| 33 namespace ui { | 34 namespace ui { |
| 34 class WorkAreaWatcherObserver; | 35 class WorkAreaWatcherObserver; |
| 35 } | 36 } |
| 36 | 37 |
| 37 // The application controller object, created by loading the MainMenu nib. | 38 // The application controller object, created by loading the MainMenu nib. |
| 38 // This handles things like responding to menus when there are no windows | 39 // This handles things like responding to menus when there are no windows |
| 39 // open, etc and acts as the NSApplication delegate. | 40 // open, etc and acts as the NSApplication delegate. |
| 40 @interface AppController : NSObject<NSUserInterfaceValidations, | 41 @interface AppController : NSObject<NSUserInterfaceValidations, |
| (...skipping 21 matching lines...) Expand all Loading... |
| 62 | 63 |
| 63 scoped_ptr<HistoryMenuBridge> historyMenuBridge_; | 64 scoped_ptr<HistoryMenuBridge> historyMenuBridge_; |
| 64 | 65 |
| 65 // Controller that manages main menu items for packaged apps. | 66 // Controller that manages main menu items for packaged apps. |
| 66 base::scoped_nsobject<AppShimMenuController> appShimMenuController_; | 67 base::scoped_nsobject<AppShimMenuController> appShimMenuController_; |
| 67 | 68 |
| 68 // The profile menu, which appears right before the Help menu. It is only | 69 // The profile menu, which appears right before the Help menu. It is only |
| 69 // available when multiple profiles is enabled. | 70 // available when multiple profiles is enabled. |
| 70 base::scoped_nsobject<ProfileMenuController> profileMenuController_; | 71 base::scoped_nsobject<ProfileMenuController> profileMenuController_; |
| 71 | 72 |
| 73 base::scoped_nsobject<ShareMenuController> shareMenuController_; |
| 74 |
| 72 // If we're told to open URLs (in particular, via |-application:openFiles:| by | 75 // If we're told to open URLs (in particular, via |-application:openFiles:| by |
| 73 // Launch Services) before we've launched the browser, we queue them up in | 76 // Launch Services) before we've launched the browser, we queue them up in |
| 74 // |startupUrls_| so that they can go in the first browser window/tab. | 77 // |startupUrls_| so that they can go in the first browser window/tab. |
| 75 std::vector<GURL> startupUrls_; | 78 std::vector<GURL> startupUrls_; |
| 76 BOOL startupComplete_; | 79 BOOL startupComplete_; |
| 77 | 80 |
| 78 // Outlets for the close tab/window menu items so that we can adjust the | 81 // Outlets for the close tab/window menu items so that we can adjust the |
| 79 // commmand-key equivalent depending on the kind of window and how many | 82 // commmand-key equivalent depending on the kind of window and how many |
| 80 // tabs it has. | 83 // tabs it has. |
| 81 IBOutlet NSMenuItem* closeTabMenuItem_; | 84 IBOutlet NSMenuItem* closeTabMenuItem_; |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 namespace app_controller_mac { | 185 namespace app_controller_mac { |
| 183 | 186 |
| 184 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in | 187 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in |
| 185 // SessionService::Observe() to get around windows/linux and mac having | 188 // SessionService::Observe() to get around windows/linux and mac having |
| 186 // different models of application lifetime. | 189 // different models of application lifetime. |
| 187 bool IsOpeningNewWindow(); | 190 bool IsOpeningNewWindow(); |
| 188 | 191 |
| 189 } // namespace app_controller_mac | 192 } // namespace app_controller_mac |
| 190 | 193 |
| 191 #endif | 194 #endif |
| OLD | NEW |