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/memory/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 "ui/base/work_area_watcher_observer.h" | 17 #include "ui/base/work_area_watcher_observer.h" |
18 | 18 |
19 class BookmarkMenuBridge; | 19 class BookmarkMenuBridge; |
20 class CommandUpdater; | 20 class CommandUpdater; |
21 class GURL; | 21 class GURL; |
22 class HistoryMenuBridge; | 22 class HistoryMenuBridge; |
23 class Profile; | 23 class Profile; |
(...skipping 15 matching lines...) Expand all Loading... |
39 // build the user-data specific main menu items. | 39 // build the user-data specific main menu items. |
40 Profile* lastProfile_; | 40 Profile* lastProfile_; |
41 | 41 |
42 // Management of the bookmark menu which spans across all windows | 42 // Management of the bookmark menu which spans across all windows |
43 // (and Browser*s). | 43 // (and Browser*s). |
44 scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_; | 44 scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_; |
45 scoped_ptr<HistoryMenuBridge> historyMenuBridge_; | 45 scoped_ptr<HistoryMenuBridge> historyMenuBridge_; |
46 | 46 |
47 // The profile menu, which appears right before the Help menu. It is only | 47 // The profile menu, which appears right before the Help menu. It is only |
48 // available when multiple profiles is enabled. | 48 // available when multiple profiles is enabled. |
49 scoped_nsobject<ProfileMenuController> profileMenuController_; | 49 base::scoped_nsobject<ProfileMenuController> profileMenuController_; |
50 | 50 |
51 // If we're told to open URLs (in particular, via |-application:openFiles:| by | 51 // If we're told to open URLs (in particular, via |-application:openFiles:| by |
52 // Launch Services) before we've launched the browser, we queue them up in | 52 // Launch Services) before we've launched the browser, we queue them up in |
53 // |startupUrls_| so that they can go in the first browser window/tab. | 53 // |startupUrls_| so that they can go in the first browser window/tab. |
54 std::vector<GURL> startupUrls_; | 54 std::vector<GURL> startupUrls_; |
55 BOOL startupComplete_; | 55 BOOL startupComplete_; |
56 | 56 |
57 // Outlets for the close tab/window menu items so that we can adjust the | 57 // Outlets for the close tab/window menu items so that we can adjust the |
58 // commmand-key equivalent depending on the kind of window and how many | 58 // commmand-key equivalent depending on the kind of window and how many |
59 // tabs it has. | 59 // tabs it has. |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 namespace app_controller_mac { | 131 namespace app_controller_mac { |
132 | 132 |
133 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in | 133 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in |
134 // SessionService::Observe() to get around windows/linux and mac having | 134 // SessionService::Observe() to get around windows/linux and mac having |
135 // different models of application lifetime. | 135 // different models of application lifetime. |
136 bool IsOpeningNewWindow(); | 136 bool IsOpeningNewWindow(); |
137 | 137 |
138 } // namespace app_controller_mac | 138 } // namespace app_controller_mac |
139 | 139 |
140 #endif | 140 #endif |
OLD | NEW |