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); |
}; |