| Index: chrome/browser/ui/cocoa/login_prompt_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm
|
| index fba3c01c5861a9ed773f13cad166755f63dd4826..dc3b6784f6a0da86e34f2c6c0bb608853955d292 100644
|
| --- a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "base/mac/bundle_locations.h"
|
| #include "base/mac/mac_util.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/strings/string16.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| @@ -73,7 +73,7 @@ class LoginHandlerMac : public LoginHandler,
|
| WebContents* requesting_contents = GetWebContentsForLogin();
|
| DCHECK(requesting_contents);
|
|
|
| - scoped_nsobject<CustomConstrainedWindowSheet> sheet(
|
| + base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(
|
| [[CustomConstrainedWindowSheet alloc]
|
| initWithCustomWindow:[sheet_controller_ window]]);
|
| constrained_window_.reset(new ConstrainedWindowMac(
|
| @@ -121,7 +121,7 @@ class LoginHandlerMac : public LoginHandler,
|
| }
|
|
|
| // The Cocoa controller of the GUI.
|
| - scoped_nsobject<LoginHandlerSheet> sheet_controller_;
|
| + base::scoped_nsobject<LoginHandlerSheet> sheet_controller_;
|
|
|
| scoped_ptr<ConstrainedWindowMac> constrained_window_;
|
|
|
|
|