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> |
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 "base/time/time.h" |
17 #include "ui/base/work_area_watcher_observer.h" | 18 #include "ui/base/work_area_watcher_observer.h" |
18 | 19 |
19 class AppControllerProfileObserver; | 20 class AppControllerProfileObserver; |
20 @class AppShimMenuController; | 21 @class AppShimMenuController; |
21 class BookmarkMenuBridge; | 22 class BookmarkMenuBridge; |
22 class CommandUpdater; | 23 class CommandUpdater; |
23 class GURL; | 24 class GURL; |
24 class HistoryMenuBridge; | 25 class HistoryMenuBridge; |
25 class Profile; | 26 class Profile; |
26 @class ProfileMenuController; | 27 @class ProfileMenuController; |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 // 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 |
74 // to it. | 75 // to it. |
75 IBOutlet NSMenu* helpMenu_; | 76 IBOutlet NSMenu* helpMenu_; |
76 | 77 |
77 // Outlet for the tabpose menu item so we can hide it. | 78 // Outlet for the tabpose menu item so we can hide it. |
78 IBOutlet NSMenuItem* tabposeMenuItem_; | 79 IBOutlet NSMenuItem* tabposeMenuItem_; |
79 | 80 |
80 // Indicates wheter an NSPopover is currently being shown. | 81 // Indicates wheter an NSPopover is currently being shown. |
81 BOOL hasPopover_; | 82 BOOL hasPopover_; |
82 | 83 |
| 84 // If we are expecting a workspace change in response to a reopen |
| 85 // event, the time we got the event. A null time otherwise. |
| 86 base::TimeTicks reopenTime_; |
| 87 |
83 // Observers that listen to the work area changes. | 88 // Observers that listen to the work area changes. |
84 ObserverList<ui::WorkAreaWatcherObserver> workAreaChangeObservers_; | 89 ObserverList<ui::WorkAreaWatcherObserver> workAreaChangeObservers_; |
85 | 90 |
86 scoped_ptr<PrefChangeRegistrar> profilePrefRegistrar_; | 91 scoped_ptr<PrefChangeRegistrar> profilePrefRegistrar_; |
87 PrefChangeRegistrar localPrefRegistrar_; | 92 PrefChangeRegistrar localPrefRegistrar_; |
88 } | 93 } |
89 | 94 |
90 @property(readonly, nonatomic) BOOL startupComplete; | 95 @property(readonly, nonatomic) BOOL startupComplete; |
91 @property(readonly, nonatomic) Profile* lastProfile; | 96 @property(readonly, nonatomic) Profile* lastProfile; |
92 | 97 |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 namespace app_controller_mac { | 145 namespace app_controller_mac { |
141 | 146 |
142 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in | 147 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in |
143 // SessionService::Observe() to get around windows/linux and mac having | 148 // SessionService::Observe() to get around windows/linux and mac having |
144 // different models of application lifetime. | 149 // different models of application lifetime. |
145 bool IsOpeningNewWindow(); | 150 bool IsOpeningNewWindow(); |
146 | 151 |
147 } // namespace app_controller_mac | 152 } // namespace app_controller_mac |
148 | 153 |
149 #endif | 154 #endif |
OLD | NEW |