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

Unified Diff: chrome/browser/ui/cocoa/infobars/infobar_container_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
Index: chrome/browser/ui/cocoa/infobars/infobar_container_controller.h
diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h
index c08ea19b797ed539ecdc4718db8e2ab69f55ad65..f645b79f4b6198bfe3bdded36bde70cbb5e9b5b6 100644
--- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h
+++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#import "chrome/browser/ui/cocoa/view_resizer.h"
#include "content/public/browser/notification_registrar.h"
@@ -58,10 +58,10 @@ const CGFloat kTipHeight = 12.0;
content::WebContents* currentWebContents_; // weak
// Holds the InfoBarControllers currently owned by this container.
- scoped_nsobject<NSMutableArray> infobarControllers_;
+ base::scoped_nsobject<NSMutableArray> infobarControllers_;
// Holds InfoBarControllers when they are in the process of animating out.
- scoped_nsobject<NSMutableSet> closingInfoBars_;
+ base::scoped_nsobject<NSMutableSet> closingInfoBars_;
// Lets us registers for INFOBAR_ADDED/INFOBAR_REMOVED
// notifications. The actual notifications are sent to the

Powered by Google App Engine
This is Rietveld 408576698