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

Unified Diff: chrome/browser/ui/cocoa/tab_contents/overlayable_contents_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/tab_contents/overlayable_contents_controller.h
diff --git a/chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h b/chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h
index 15ef7a6877339f60e7eac77d2cb5dff3c15bc7d7..950465343dacf99bda5975d8f52e9175f438a44e 100644
--- a/chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h
+++ b/chrome/browser/ui/cocoa/tab_contents/overlayable_contents_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"
#include "chrome/common/instant_types.h"
@@ -33,7 +33,7 @@ class WebContents;
@interface OverlayableContentsController : NSViewController {
@private
// Container view for the "active" contents.
- scoped_nsobject<NSView> activeContainer_;
+ base::scoped_nsobject<NSView> activeContainer_;
// The overlay WebContents. Will be NULL if no overlay is currently showing.
content::WebContents* overlayContents_; // weak
@@ -50,11 +50,11 @@ class WebContents;
BOOL drawDropShadow_;
// View responsible for drawing a drop shadow.
- scoped_nsobject<NSView> dropShadowView_;
+ base::scoped_nsobject<NSView> dropShadowView_;
// View responsible for drawing a separator at the top. The separator is
// only visible when the overlay is positioned right next to the omnibox.
- scoped_nsobject<NSView> topSeparatorView_;
+ base::scoped_nsobject<NSView> topSeparatorView_;
BrowserWindowController* windowController_;

Powered by Google App Engine
This is Rietveld 408576698