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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 // when a profile has been deleted. | 54 // when a profile has been deleted. |
55 std::unique_ptr<AppControllerProfileObserver> | 55 std::unique_ptr<AppControllerProfileObserver> |
56 profileAttributesStorageObserver_; | 56 profileAttributesStorageObserver_; |
57 | 57 |
58 // Management of the bookmark menu which spans across all windows | 58 // Management of the bookmark menu which spans across all windows |
59 // (and Browser*s). |profileBookmarkMenuBridgeMap_| is a cache that owns one | 59 // (and Browser*s). |profileBookmarkMenuBridgeMap_| is a cache that owns one |
60 // pointer to a BookmarkMenuBridge for each profile. |bookmarkMenuBridge_| is | 60 // pointer to a BookmarkMenuBridge for each profile. |bookmarkMenuBridge_| is |
61 // a weak pointer that is updated to match the corresponding cache entry | 61 // a weak pointer that is updated to match the corresponding cache entry |
62 // during a profile switch. | 62 // during a profile switch. |
63 BookmarkMenuBridge* bookmarkMenuBridge_; | 63 BookmarkMenuBridge* bookmarkMenuBridge_; |
64 std::map<base::FilePath, BookmarkMenuBridge*> profileBookmarkMenuBridgeMap_; | 64 std::map<base::FilePath, std::unique_ptr<BookmarkMenuBridge>> |
| 65 profileBookmarkMenuBridgeMap_; |
65 | 66 |
66 std::unique_ptr<HistoryMenuBridge> historyMenuBridge_; | 67 std::unique_ptr<HistoryMenuBridge> historyMenuBridge_; |
67 | 68 |
68 // Controller that manages main menu items for packaged apps. | 69 // Controller that manages main menu items for packaged apps. |
69 base::scoped_nsobject<AppShimMenuController> appShimMenuController_; | 70 base::scoped_nsobject<AppShimMenuController> appShimMenuController_; |
70 | 71 |
71 // The profile menu, which appears right before the Help menu. It is only | 72 // The profile menu, which appears right before the Help menu. It is only |
72 // available when multiple profiles is enabled. | 73 // available when multiple profiles is enabled. |
73 base::scoped_nsobject<ProfileMenuController> profileMenuController_; | 74 base::scoped_nsobject<ProfileMenuController> profileMenuController_; |
74 | 75 |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 namespace app_controller_mac { | 193 namespace app_controller_mac { |
193 | 194 |
194 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in | 195 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in |
195 // SessionService::Observe() to get around windows/linux and mac having | 196 // SessionService::Observe() to get around windows/linux and mac having |
196 // different models of application lifetime. | 197 // different models of application lifetime. |
197 bool IsOpeningNewWindow(); | 198 bool IsOpeningNewWindow(); |
198 | 199 |
199 } // namespace app_controller_mac | 200 } // namespace app_controller_mac |
200 | 201 |
201 #endif | 202 #endif |
OLD | NEW |