Index: chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm |
diff --git a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm |
index 3a718a4188dae90e9f4f072b1e4dd3b5d3db9d87..36529a9c871647a586eb0870a08253bac20e13de 100644 |
--- a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm |
+++ b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm |
@@ -6,7 +6,7 @@ |
#import <Cocoa/Cocoa.h> |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h" |
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h" |
#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" |
@@ -95,7 +95,7 @@ class ConstrainedWebDialogDelegateViewMac : |
private: |
scoped_ptr<ConstrainedWebDialogDelegateMac> impl_; |
scoped_ptr<ConstrainedWindowMac> constrained_window_; |
- scoped_nsobject<NSWindow> window_; |
+ base::scoped_nsobject<NSWindow> window_; |
DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateViewMac); |
}; |
@@ -119,9 +119,8 @@ ConstrainedWebDialogDelegateViewMac::ConstrainedWebDialogDelegateViewMac( |
[[window_ contentView] |
addSubview:GetWebContents()->GetView()->GetNativeView()]; |
- scoped_nsobject<CustomConstrainedWindowSheet> sheet( |
- [[CustomConstrainedWindowSheet alloc] |
- initWithCustomWindow:window_]); |
+ base::scoped_nsobject<CustomConstrainedWindowSheet> sheet( |
+ [[CustomConstrainedWindowSheet alloc] initWithCustomWindow:window_]); |
constrained_window_.reset(new ConstrainedWindowMac( |
this, web_contents, sheet)); |