| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 // commmand-key equivalent depending on the kind of window and how many | 68 // commmand-key equivalent depending on the kind of window and how many |
| 69 // tabs it has. | 69 // tabs it has. |
| 70 IBOutlet NSMenuItem* closeTabMenuItem_; | 70 IBOutlet NSMenuItem* closeTabMenuItem_; |
| 71 IBOutlet NSMenuItem* closeWindowMenuItem_; | 71 IBOutlet NSMenuItem* closeWindowMenuItem_; |
| 72 BOOL fileMenuUpdatePending_; // ensure we only do this once per notificaion. | 72 BOOL fileMenuUpdatePending_; // ensure we only do this once per notificaion. |
| 73 | 73 |
| 74 // Outlet for the help menu so we can bless it so Cocoa adds the search item | 74 // Outlet for the help menu so we can bless it so Cocoa adds the search item |
| 75 // to it. | 75 // to it. |
| 76 IBOutlet NSMenu* helpMenu_; | 76 IBOutlet NSMenu* helpMenu_; |
| 77 | 77 |
| 78 // Outlet for the tabpose menu item so we can hide it. | |
| 79 IBOutlet NSMenuItem* tabposeMenuItem_; | |
| 80 | |
| 81 // Indicates wheter an NSPopover is currently being shown. | 78 // Indicates wheter an NSPopover is currently being shown. |
| 82 BOOL hasPopover_; | 79 BOOL hasPopover_; |
| 83 | 80 |
| 84 // If we are expecting a workspace change in response to a reopen | 81 // If we are expecting a workspace change in response to a reopen |
| 85 // event, the time we got the event. A null time otherwise. | 82 // event, the time we got the event. A null time otherwise. |
| 86 base::TimeTicks reopenTime_; | 83 base::TimeTicks reopenTime_; |
| 87 | 84 |
| 88 // Observers that listen to the work area changes. | 85 // Observers that listen to the work area changes. |
| 89 ObserverList<ui::WorkAreaWatcherObserver> workAreaChangeObservers_; | 86 ObserverList<ui::WorkAreaWatcherObserver> workAreaChangeObservers_; |
| 90 | 87 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 namespace app_controller_mac { | 146 namespace app_controller_mac { |
| 150 | 147 |
| 151 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in | 148 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in |
| 152 // SessionService::Observe() to get around windows/linux and mac having | 149 // SessionService::Observe() to get around windows/linux and mac having |
| 153 // different models of application lifetime. | 150 // different models of application lifetime. |
| 154 bool IsOpeningNewWindow(); | 151 bool IsOpeningNewWindow(); |
| 155 | 152 |
| 156 } // namespace app_controller_mac | 153 } // namespace app_controller_mac |
| 157 | 154 |
| 158 #endif | 155 #endif |
| OLD | NEW |