OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_ |
6 #define CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_ | 6 #define CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_ |
7 | 7 |
8 #import <AppKit/AppKit.h> | 8 #import <AppKit/AppKit.h> |
9 | 9 |
| 10 #include <memory> |
| 11 |
10 #include "base/mac/scoped_nsobject.h" | 12 #include "base/mac/scoped_nsobject.h" |
11 #include "base/macros.h" | 13 #include "base/macros.h" |
12 #include "base/memory/scoped_ptr.h" | |
13 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
14 #include "components/prefs/pref_member.h" | 15 #include "components/prefs/pref_member.h" |
15 #include "ui/message_center/message_center.h" | 16 #include "ui/message_center/message_center.h" |
16 #include "ui/message_center/message_center_tray_delegate.h" | 17 #include "ui/message_center/message_center_tray_delegate.h" |
17 | 18 |
18 @class MCPopupCollection; | 19 @class MCPopupCollection; |
19 | 20 |
20 namespace message_center { | 21 namespace message_center { |
21 class MessageCenter; | 22 class MessageCenter; |
22 class MessageCenterTray; | 23 class MessageCenterTray; |
(...skipping 21 matching lines...) Expand all Loading... |
44 | 45 |
45 message_center::MessageCenter* message_center() { return message_center_; } | 46 message_center::MessageCenter* message_center() { return message_center_; } |
46 | 47 |
47 private: | 48 private: |
48 friend class MessageCenterTrayBridgeTest; | 49 friend class MessageCenterTrayBridgeTest; |
49 | 50 |
50 // The global, singleton message center model object. Weak. | 51 // The global, singleton message center model object. Weak. |
51 message_center::MessageCenter* message_center_; | 52 message_center::MessageCenter* message_center_; |
52 | 53 |
53 // C++ controller for the notification tray UI. | 54 // C++ controller for the notification tray UI. |
54 scoped_ptr<message_center::MessageCenterTray> tray_; | 55 std::unique_ptr<message_center::MessageCenterTray> tray_; |
55 | 56 |
56 // Obj-C controller for the on-screen popup notifications. | 57 // Obj-C controller for the on-screen popup notifications. |
57 base::scoped_nsobject<MCPopupCollection> popup_collection_; | 58 base::scoped_nsobject<MCPopupCollection> popup_collection_; |
58 | 59 |
59 DISALLOW_COPY_AND_ASSIGN(MessageCenterTrayBridge); | 60 DISALLOW_COPY_AND_ASSIGN(MessageCenterTrayBridge); |
60 }; | 61 }; |
61 | 62 |
62 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_ | 63 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_ |
OLD | NEW |