| Index: ui/views/cocoa/bridged_native_widget.h
|
| diff --git a/ui/views/cocoa/bridged_native_widget.h b/ui/views/cocoa/bridged_native_widget.h
|
| index fc521597ee7fc79d28bc3a367c2d08a99890ee7b..e4df8e78faa70618d410ebea6d4e33daf9923193 100644
|
| --- a/ui/views/cocoa/bridged_native_widget.h
|
| +++ b/ui/views/cocoa/bridged_native_widget.h
|
| @@ -7,11 +7,11 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #import "base/mac/scoped_nsobject.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #import "ui/accelerated_widget_mac/accelerated_widget_mac.h"
|
| #include "ui/base/ime/input_method_delegate.h"
|
| #include "ui/compositor/layer_owner.h"
|
| @@ -260,9 +260,9 @@ class VIEWS_EXPORT BridgedNativeWidget
|
| base::scoped_nsobject<NSWindow> window_;
|
| base::scoped_nsobject<ViewsNSWindowDelegate> window_delegate_;
|
| base::scoped_nsobject<BridgedContentView> bridged_view_;
|
| - scoped_ptr<ui::InputMethod> input_method_;
|
| - scoped_ptr<CocoaMouseCapture> mouse_capture_;
|
| - scoped_ptr<TooltipManager> tooltip_manager_;
|
| + std::unique_ptr<ui::InputMethod> input_method_;
|
| + std::unique_ptr<CocoaMouseCapture> mouse_capture_;
|
| + std::unique_ptr<TooltipManager> tooltip_manager_;
|
| FocusManager* focus_manager_; // Weak. Owned by our Widget.
|
| Widget::InitParams::Type widget_type_;
|
|
|
| @@ -270,8 +270,8 @@ class VIEWS_EXPORT BridgedNativeWidget
|
| std::vector<BridgedNativeWidget*> child_windows_;
|
|
|
| base::scoped_nsobject<NSView> compositor_superview_;
|
| - scoped_ptr<ui::AcceleratedWidgetMac> compositor_widget_;
|
| - scoped_ptr<ui::Compositor> compositor_;
|
| + std::unique_ptr<ui::AcceleratedWidgetMac> compositor_widget_;
|
| + std::unique_ptr<ui::Compositor> compositor_;
|
|
|
| // Tracks the bounds when the window last started entering fullscreen. Used to
|
| // provide an answer for GetRestoredBounds(), but not ever sent to Cocoa (it
|
|
|