| Index: chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
|
| diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
|
| index 7aa97ff7620b793a5c79c1d842b75e5c4241ca3f..aa7153c0e15e46a0a27399820ca82c9bd347a8e2 100644
|
| --- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
|
| +++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
|
| @@ -8,7 +8,7 @@
|
| #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
|
|
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/memory/scoped_ptr.h"
|
|
|
| #if __OBJC__
|
| @@ -37,7 +37,7 @@ class JavaScriptAppModalDialogCocoa : public NativeAppModalDialog {
|
| private:
|
| scoped_ptr<JavaScriptAppModalDialog> dialog_;
|
|
|
| - scoped_nsobject<JavaScriptAppModalDialogHelper> helper_;
|
| + base::scoped_nsobject<JavaScriptAppModalDialogHelper> helper_;
|
| NSAlert* alert_; // weak, owned by |helper_|.
|
|
|
| DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialogCocoa);
|
|
|