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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
diff --git a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
index f8ca7b327951c1588d7585b0e1346dc038b6787c..d78a9109041e538ce08972aa97c765a8ac6ad56e 100644
--- a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
+++ b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
@@ -8,7 +8,7 @@
#import <AppKit/AppKit.h>
#include "base/basictypes.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ui/message_center/message_center_tray_delegate.h"
@@ -59,13 +59,13 @@ class MessageCenterTrayBridge :
scoped_ptr<message_center::MessageCenterTray> tray_;
// Obj-C window controller for the notification tray.
- scoped_nsobject<MCTrayController> tray_controller_;
+ base::scoped_nsobject<MCTrayController> tray_controller_;
// View that is displayed on the system menu bar item.
- scoped_nsobject<MCStatusItemView> status_item_view_;
+ base::scoped_nsobject<MCStatusItemView> status_item_view_;
// Obj-C controller for the on-screen popup notifications.
- scoped_nsobject<MCPopupCollection> popup_collection_;
+ base::scoped_nsobject<MCPopupCollection> popup_collection_;
// Weak pointer factory to posts tasks to self.
base::WeakPtrFactory<MessageCenterTrayBridge> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698