| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #import <Cocoa/Cocoa.h> | 9 #import <Cocoa/Cocoa.h> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_; | 32 scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_; |
| 33 scoped_ptr<HistoryMenuBridge> historyMenuBridge_; | 33 scoped_ptr<HistoryMenuBridge> historyMenuBridge_; |
| 34 AboutWindowController* aboutController_; // Weak. | 34 AboutWindowController* aboutController_; // Weak. |
| 35 | 35 |
| 36 // If we're told to open URLs (in particular, via |-application:openFiles:| by | 36 // If we're told to open URLs (in particular, via |-application:openFiles:| by |
| 37 // Launch Services) before we've launched the browser, we queue them up in | 37 // Launch Services) before we've launched the browser, we queue them up in |
| 38 // |startupUrls_| so that they can go in the first browser window/tab. | 38 // |startupUrls_| so that they can go in the first browser window/tab. |
| 39 std::vector<GURL> startupUrls_; | 39 std::vector<GURL> startupUrls_; |
| 40 BOOL startupComplete_; | 40 BOOL startupComplete_; |
| 41 | 41 |
| 42 // Outlets for the close tab/window menu items so that we can adjust the | |
| 43 // commmand-key equivalent depending on the kind of window and how many | |
| 44 // tabs it has. | |
| 45 IBOutlet NSMenuItem* closeTabMenuItem_; | |
| 46 IBOutlet NSMenuItem* closeWindowMenuItem_; | |
| 47 BOOL fileMenuUpdatePending_; // ensure we only do this once per notificaion. | |
| 48 | |
| 49 // Outlet for the help menu so we can bless it so Cocoa adds the search item | 42 // Outlet for the help menu so we can bless it so Cocoa adds the search item |
| 50 // to it. | 43 // to it. |
| 51 IBOutlet NSMenu* helpMenu_; | 44 IBOutlet NSMenu* helpMenu_; |
| 52 | 45 |
| 53 // Outlet for the tabpose menu item so we can hide it. | 46 // Outlet for the tabpose menu item so we can hide it. |
| 54 IBOutlet NSMenuItem* tabposeMenuItem_; | 47 IBOutlet NSMenuItem* tabposeMenuItem_; |
| 55 } | 48 } |
| 56 | 49 |
| 57 @property(readonly, nonatomic) BOOL startupComplete; | 50 @property(readonly, nonatomic) BOOL startupComplete; |
| 58 | 51 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 - (const std::vector<GURL>&)startupUrls; | 83 - (const std::vector<GURL>&)startupUrls; |
| 91 | 84 |
| 92 // Clear the list of startup URLs. | 85 // Clear the list of startup URLs. |
| 93 - (void)clearStartupUrls; | 86 - (void)clearStartupUrls; |
| 94 | 87 |
| 95 - (BookmarkMenuBridge*)bookmarkMenuBridge; | 88 - (BookmarkMenuBridge*)bookmarkMenuBridge; |
| 96 | 89 |
| 97 @end | 90 @end |
| 98 | 91 |
| 99 #endif | 92 #endif |
| OLD | NEW |