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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/message_center/cocoa/tray_controller.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
« ui/message_center/cocoa/popup_controller.mm ('K') | « ui/message_center/cocoa/status_item_view_unittest.mm ('k') | ui/message_center/cocoa/tray_controller.mm » ('j') | ui/message_center/cocoa/tray_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/cocoa/tray_controller.h
diff --git a/ui/message_center/cocoa/tray_controller.h b/ui/message_center/cocoa/tray_controller.h
index 50e94fa850a960bc72835786eac1ecca7aac8768..d855cd80c18c851aa5ab0a150f1c6aefe1195fb7 100644
--- a/ui/message_center/cocoa/tray_controller.h
+++ b/ui/message_center/cocoa/tray_controller.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 "ui/message_center/message_center_export.h"
@class MCTrayViewController;
@@ -25,7 +25,7 @@ MESSAGE_CENTER_EXPORT
message_center::MessageCenterTray* tray_; // Weak, indirectly owns this.
// View controller that provides this window's content.
- scoped_nsobject<MCTrayViewController> viewController_;
+ base::scoped_nsobject<MCTrayViewController> viewController_;
// An event monitor that listens for clicks outside the tray window to cause
// it to close.
« ui/message_center/cocoa/popup_controller.mm ('K') | « ui/message_center/cocoa/status_item_view_unittest.mm ('k') | ui/message_center/cocoa/tray_controller.mm » ('j') | ui/message_center/cocoa/tray_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698