Index: content/browser/web_contents/web_contents_view_mac.h |
diff --git a/content/browser/web_contents/web_contents_view_mac.h b/content/browser/web_contents/web_contents_view_mac.h |
index 58aac4b4d16880859e09f87f72911d5e724aa177..16dffcd03116456bbc7f3e967b2a43cfd1b05104 100644 |
--- a/content/browser/web_contents/web_contents_view_mac.h |
+++ b/content/browser/web_contents/web_contents_view_mac.h |
@@ -10,7 +10,7 @@ |
#include <string> |
#include <vector> |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "base/memory/scoped_ptr.h" |
#include "content/common/content_export.h" |
#include "content/common/drag_event_source_info.h" |
@@ -38,8 +38,8 @@ CONTENT_EXPORT |
@interface WebContentsViewCocoa : BaseView { |
@private |
content::WebContentsViewMac* webContentsView_; // WEAK; owns us |
- scoped_nsobject<WebDragSource> dragSource_; |
- scoped_nsobject<WebDragDest> dragDest_; |
+ base::scoped_nsobject<WebDragSource> dragSource_; |
+ base::scoped_nsobject<WebDragDest> dragDest_; |
BOOL mouseDownCanMoveWindow_; |
} |
@@ -125,11 +125,11 @@ class WebContentsViewMac : public WebContentsViewPort, |
WebContentsImpl* web_contents_; |
// The Cocoa NSView that lives in the view hierarchy. |
- scoped_nsobject<WebContentsViewCocoa> cocoa_view_; |
+ base::scoped_nsobject<WebContentsViewCocoa> cocoa_view_; |
// Keeps track of which NSView has focus so we can restore the focus when |
// focus returns. |
- scoped_nsobject<FocusTracker> focus_tracker_; |
+ base::scoped_nsobject<FocusTracker> focus_tracker_; |
// Our optional delegate. |
scoped_ptr<WebContentsViewDelegate> delegate_; |