| Index: content/browser/web_contents/web_contents_view_mac.h
|
| diff --git a/content/browser/web_contents/web_contents_view_mac.h b/content/browser/web_contents/web_contents_view_mac.h
|
| index bcd6a26c9bcc39345e0f712c3ae17ce72d0f4c97..b4e597b929833a8c15992682dcd9d52e812848c4 100644
|
| --- a/content/browser/web_contents/web_contents_view_mac.h
|
| +++ b/content/browser/web_contents/web_contents_view_mac.h
|
| @@ -7,12 +7,12 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/mac/scoped_nsobject.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/browser/renderer_host/render_view_host_delegate_view.h"
|
| #include "content/browser/web_contents/web_contents_view.h"
|
| #include "content/common/content_export.h"
|
| @@ -144,12 +144,12 @@ class WebContentsViewMac : public WebContentsView,
|
| base::scoped_nsobject<FocusTracker> focus_tracker_;
|
|
|
| // Our optional delegate.
|
| - scoped_ptr<WebContentsViewDelegate> delegate_;
|
| + std::unique_ptr<WebContentsViewDelegate> delegate_;
|
|
|
| // Whether to allow other views.
|
| bool allow_other_views_;
|
|
|
| - scoped_ptr<PopupMenuHelper> popup_menu_helper_;
|
| + std::unique_ptr<PopupMenuHelper> popup_menu_helper_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac);
|
| };
|
|
|