| Index: ui/views/mus/native_widget_mus.h
|
| diff --git a/ui/views/mus/native_widget_mus.h b/ui/views/mus/native_widget_mus.h
|
| index 19a4df75019770cfca50462d951a2d8891e71544..c9809bb425a38a0dbe96966a0281c513300cd144 100644
|
| --- a/ui/views/mus/native_widget_mus.h
|
| +++ b/ui/views/mus/native_widget_mus.h
|
| @@ -54,8 +54,12 @@ class FocusController;
|
| }
|
|
|
| namespace views {
|
| +namespace corewm {
|
| +class TooltipController;
|
| +}
|
| class DropHelper;
|
| class DropTargetMus;
|
| +class TooltipManagerAura;
|
| class WidgetDelegate;
|
|
|
| // An implementation of NativeWidget that binds to a ui::Window. Because Aura
|
| @@ -279,11 +283,6 @@ class VIEWS_MUS_EXPORT NativeWidgetMus
|
| // a separate class.
|
| std::unique_ptr<MusWindowObserver> mus_window_observer_;
|
|
|
| - // This is misnamed; The native widget interface offers something called
|
| - // "native window properties" which are properties which it stores locally,
|
| - // and this is used to unsafely pass void* pointers around chrome.
|
| - std::map<std::string, void*> native_window_properties_;
|
| -
|
| // Receives drop events for |window_|.
|
| std::unique_ptr<DropTargetMus> drop_target_;
|
|
|
| @@ -300,6 +299,9 @@ class VIEWS_MUS_EXPORT NativeWidgetMus
|
| std::unique_ptr<DropHelper> drop_helper_;
|
| int last_drop_operation_;
|
|
|
| + std::unique_ptr<corewm::TooltipController> tooltip_controller_;
|
| + std::unique_ptr<TooltipManagerAura> tooltip_manager_;
|
| +
|
| base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
|
|
|