| Index: chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h
|
| diff --git a/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h b/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h
|
| index 35824de00699666f759ed4c62d033075e9d83dcd..442044c9a14528d65e40bde4772e30903604367c 100644
|
| --- a/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h
|
| +++ b/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h
|
| @@ -11,7 +11,7 @@
|
| #include <map>
|
|
|
| #include "base/basictypes.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/ui/panels/native_panel_stack_window.h"
|
| #include "ui/gfx/rect.h"
|
| @@ -70,7 +70,7 @@ class PanelStackWindowCocoa : public NativePanelStackWindow {
|
| NativePanelStackWindowDelegate* delegate_;
|
|
|
| // The underlying window.
|
| - scoped_nsobject<NSWindow> window_;
|
| + base::scoped_nsobject<NSWindow> window_;
|
|
|
| Panels panels_;
|
|
|
| @@ -85,7 +85,8 @@ class PanelStackWindowCocoa : public NativePanelStackWindow {
|
| // Used to animate the bounds changes at a synchronized pace.
|
| // Lifetime controlled manually, needs more than just |release| to terminate.
|
| NSViewAnimation* bounds_animation_;
|
| - scoped_nsobject<BatchBoundsAnimationDelegate> bounds_animation_delegate_;
|
| + base::scoped_nsobject<BatchBoundsAnimationDelegate>
|
| + bounds_animation_delegate_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PanelStackWindowCocoa);
|
| };
|
|
|