| Index: content/browser/web_contents/web_contents_view_overscroll_animator_slider_mac.h
|
| diff --git a/content/browser/web_contents/web_contents_view_overscroll_animator_slider_mac.h b/content/browser/web_contents/web_contents_view_overscroll_animator_slider_mac.h
|
| index 2cc87ec0071a2b0cc6a83d42f852c4c954d6633f..326c868b41c653adba0d85bffed6b4aea8998278 100644
|
| --- a/content/browser/web_contents/web_contents_view_overscroll_animator_slider_mac.h
|
| +++ b/content/browser/web_contents/web_contents_view_overscroll_animator_slider_mac.h
|
| @@ -7,8 +7,9 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/mac/scoped_nsobject.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/browser/web_contents/web_contents_view_overscroll_animator_mac.h"
|
|
|
| namespace overscroll_animator {
|
| @@ -52,7 +53,7 @@ class WebContentsPaintObserver;
|
|
|
| // An observer that reports the first non-empty paint of a WebContents. This
|
| // is used when completing an overscroll animation.
|
| - scoped_ptr<overscroll_animator::WebContentsPaintObserver> observer_;
|
| + std::unique_ptr<overscroll_animator::WebContentsPaintObserver> observer_;
|
| }
|
| @end
|
|
|
|
|