| 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 // Outlets for the close tab/window menu items so that we can adjust the | 78 // 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 | 79 // commmand-key equivalent depending on the kind of window and how many |
| 80 // tabs it has. | 80 // tabs it has. |
| 81 IBOutlet NSMenuItem* closeTabMenuItem_; | 81 IBOutlet NSMenuItem* closeTabMenuItem_; |
| 82 IBOutlet NSMenuItem* closeWindowMenuItem_; | 82 IBOutlet NSMenuItem* closeWindowMenuItem_; |
| 83 | 83 |
| 84 // Outlet for the help menu so we can bless it so Cocoa adds the search item | 84 // Outlet for the help menu so we can bless it so Cocoa adds the search item |
| 85 // to it. | 85 // to it. |
| 86 IBOutlet NSMenu* helpMenu_; | 86 IBOutlet NSMenu* helpMenu_; |
| 87 | 87 |
| 88 // Indicates wheter an NSPopover is currently being shown. | |
| 89 BOOL hasPopover_; | |
| 90 | |
| 91 // If we are expecting a workspace change in response to a reopen | 88 // If we are expecting a workspace change in response to a reopen |
| 92 // event, the time we got the event. A null time otherwise. | 89 // event, the time we got the event. A null time otherwise. |
| 93 base::TimeTicks reopenTime_; | 90 base::TimeTicks reopenTime_; |
| 94 | 91 |
| 95 // Observers that listen to the work area changes. | 92 // Observers that listen to the work area changes. |
| 96 ObserverList<ui::WorkAreaWatcherObserver> workAreaChangeObservers_; | 93 ObserverList<ui::WorkAreaWatcherObserver> workAreaChangeObservers_; |
| 97 | 94 |
| 98 scoped_ptr<PrefChangeRegistrar> profilePrefRegistrar_; | 95 scoped_ptr<PrefChangeRegistrar> profilePrefRegistrar_; |
| 99 PrefChangeRegistrar localPrefRegistrar_; | 96 PrefChangeRegistrar localPrefRegistrar_; |
| 100 | 97 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 namespace app_controller_mac { | 175 namespace app_controller_mac { |
| 179 | 176 |
| 180 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in | 177 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in |
| 181 // SessionService::Observe() to get around windows/linux and mac having | 178 // SessionService::Observe() to get around windows/linux and mac having |
| 182 // different models of application lifetime. | 179 // different models of application lifetime. |
| 183 bool IsOpeningNewWindow(); | 180 bool IsOpeningNewWindow(); |
| 184 | 181 |
| 185 } // namespace app_controller_mac | 182 } // namespace app_controller_mac |
| 186 | 183 |
| 187 #endif | 184 #endif |
| OLD | NEW |