| Index: content/browser/web_contents/web_contents_view_aura.h
|
| diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h
|
| index 2c4b41d6cc4e2a8b53692a9bae1b6f7b89090485..1395f61ab0427a1db6c17958de10ae5f0da2a402 100644
|
| --- a/content/browser/web_contents/web_contents_view_aura.h
|
| +++ b/content/browser/web_contents/web_contents_view_aura.h
|
| @@ -5,12 +5,12 @@
|
| #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
|
| #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/browser/renderer_host/overscroll_controller_delegate.h"
|
| #include "content/browser/renderer_host/render_view_host_delegate_view.h"
|
| #include "content/browser/web_contents/web_contents_view.h"
|
| @@ -162,18 +162,18 @@ class CONTENT_EXPORT WebContentsViewAura
|
|
|
| FRIEND_TEST_ALL_PREFIXES(WebContentsViewAuraTest, EnableDisableOverscroll);
|
|
|
| - scoped_ptr<aura::Window> window_;
|
| + std::unique_ptr<aura::Window> window_;
|
|
|
| - scoped_ptr<WindowObserver> window_observer_;
|
| + std::unique_ptr<WindowObserver> window_observer_;
|
|
|
| // The WebContentsImpl whose contents we display.
|
| WebContentsImpl* web_contents_;
|
|
|
| - scoped_ptr<WebContentsViewDelegate> delegate_;
|
| + std::unique_ptr<WebContentsViewDelegate> delegate_;
|
|
|
| blink::WebDragOperationsMask current_drag_op_;
|
|
|
| - scoped_ptr<DropData> current_drop_data_;
|
| + std::unique_ptr<DropData> current_drop_data_;
|
|
|
| WebDragDestDelegate* drag_dest_delegate_;
|
|
|
| @@ -192,9 +192,9 @@ class CONTENT_EXPORT WebContentsViewAura
|
|
|
| // This manages the overlay window that shows the screenshot during a history
|
| // navigation triggered by the overscroll gesture.
|
| - scoped_ptr<OverscrollNavigationOverlay> navigation_overlay_;
|
| + std::unique_ptr<OverscrollNavigationOverlay> navigation_overlay_;
|
|
|
| - scoped_ptr<GestureNavSimple> gesture_nav_simple_;
|
| + std::unique_ptr<GestureNavSimple> gesture_nav_simple_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
|
| };
|
|
|