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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/message_center/cocoa/status_item_view.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/settings_controller_unittest.mm ('k') | ui/message_center/cocoa/status_item_view_unittest.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/status_item_view.h
diff --git a/ui/message_center/cocoa/status_item_view.h b/ui/message_center/cocoa/status_item_view.h
index 29a26eb244562b1c588709fe6014e62af78df224..f317dff506a98aff2652073e4bbbcd932e82cb5a 100644
--- a/ui/message_center/cocoa/status_item_view.h
+++ b/ui/message_center/cocoa/status_item_view.h
@@ -8,7 +8,7 @@
#import <AppKit/AppKit.h>
#include "base/mac/scoped_block.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "ui/message_center/message_center_export.h"
namespace message_center {
@@ -27,7 +27,7 @@ MESSAGE_CENTER_EXPORT
@interface MCStatusItemView : NSView {
@private
// The status item.
- scoped_nsobject<NSStatusItem> statusItem_;
+ base::scoped_nsobject<NSStatusItem> statusItem_;
// Callback issued when the status item is clicked.
base::mac::ScopedBlock<message_center::StatusItemClickedCallack> callback_;
« ui/message_center/cocoa/popup_controller.mm ('K') | « ui/message_center/cocoa/settings_controller_unittest.mm ('k') | ui/message_center/cocoa/status_item_view_unittest.mm » ('j') | ui/message_center/cocoa/tray_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698