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

Unified Diff: ui/base/cocoa/tracking_area.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: ui/base/cocoa/tracking_area.h
diff --git a/ui/base/cocoa/tracking_area.h b/ui/base/cocoa/tracking_area.h
index 2800bc27cad61f8c04452b8c85fd5b39b24460e0..782cdaea2703b2eb3f0584c9b78446fca6fc99a8 100644
--- a/ui/base/cocoa/tracking_area.h
+++ b/ui/base/cocoa/tracking_area.h
@@ -7,7 +7,7 @@
#import <AppKit/AppKit.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "ui/base/ui_export.h"
@class CrTrackingAreaOwnerProxy;
@@ -17,7 +17,7 @@
UI_EXPORT
@interface CrTrackingArea : NSTrackingArea {
@private
- scoped_nsobject<CrTrackingAreaOwnerProxy> ownerProxy_;
+ base::scoped_nsobject<CrTrackingAreaOwnerProxy> ownerProxy_;
}
// Designated initializer. Forwards all arguments to the superclass, but wraps
@@ -56,7 +56,7 @@ class UI_EXPORT ScopedCrTrackingArea {
CrTrackingArea* get() const;
private:
- scoped_nsobject<CrTrackingArea> tracking_area_;
+ base::scoped_nsobject<CrTrackingArea> tracking_area_;
DISALLOW_COPY_AND_ASSIGN(ScopedCrTrackingArea);
};

Powered by Google App Engine
This is Rietveld 408576698