Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Side by Side Diff: chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_nsobject.h" 11 #include "base/mac/scoped_nsobject.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "ui/message_center/message_center_tray_delegate.h" 14 #include "ui/message_center/message_center_tray_delegate.h"
15 15
16 @class MCPopupCollection; 16 @class MCPopupCollection;
17 @class MCStatusItemView; 17 @class MCStatusItemView;
18 @class MCTrayController; 18 @class MCTrayController;
19 19
20 namespace message_center { 20 namespace message_center {
21 class MessageCenter; 21 class MessageCenter;
(...skipping 30 matching lines...) Expand all
52 // Opens the message center tray. 52 // Opens the message center tray.
53 void OpenTrayWindow(); 53 void OpenTrayWindow();
54 54
55 // The global, singleton message center model object. Weak. 55 // The global, singleton message center model object. Weak.
56 message_center::MessageCenter* message_center_; 56 message_center::MessageCenter* message_center_;
57 57
58 // C++ controller for the notification tray UI. 58 // C++ controller for the notification tray UI.
59 scoped_ptr<message_center::MessageCenterTray> tray_; 59 scoped_ptr<message_center::MessageCenterTray> tray_;
60 60
61 // Obj-C window controller for the notification tray. 61 // Obj-C window controller for the notification tray.
62 scoped_nsobject<MCTrayController> tray_controller_; 62 base::scoped_nsobject<MCTrayController> tray_controller_;
63 63
64 // View that is displayed on the system menu bar item. 64 // View that is displayed on the system menu bar item.
65 scoped_nsobject<MCStatusItemView> status_item_view_; 65 base::scoped_nsobject<MCStatusItemView> status_item_view_;
66 66
67 // Obj-C controller for the on-screen popup notifications. 67 // Obj-C controller for the on-screen popup notifications.
68 scoped_nsobject<MCPopupCollection> popup_collection_; 68 base::scoped_nsobject<MCPopupCollection> popup_collection_;
69 69
70 // Weak pointer factory to posts tasks to self. 70 // Weak pointer factory to posts tasks to self.
71 base::WeakPtrFactory<MessageCenterTrayBridge> weak_ptr_factory_; 71 base::WeakPtrFactory<MessageCenterTrayBridge> weak_ptr_factory_;
72 72
73 DISALLOW_COPY_AND_ASSIGN(MessageCenterTrayBridge); 73 DISALLOW_COPY_AND_ASSIGN(MessageCenterTrayBridge);
74 }; 74 };
75 75
76 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_ 76 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_MESSAGE_CENTER_TRAY_BRIDGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698