mus: Use TooltipManagerAura in NativeWidgetMus.

ui/views/mus/native_widget_mus.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 36 matching lines @@
 namespace ui {
 class Event;
 }
 
 namespace wm {
 class CursorManager;
 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
 // is used extensively within Views code, this code uses aura and binds to the
 // ui::Window via a Mus-specific aura::WindowTreeHost impl. Because the root
 // aura::Window in a hierarchy is created without a delegate by the
 // aura::WindowTreeHost, we must create a child aura::Window in this class
 // (content_) and attach it to the root.
 class VIEWS_MUS_EXPORT NativeWidgetMus
     : public internal::NativeWidgetPrivate,
@@ skipping 203 matching lines @@
   const ui::mojom::SurfaceType surface_type_;
   ui::mojom::ShowState show_state_before_fullscreen_;
 
   // See class documentation for Widget in widget.h for a note about ownership.
   Widget::InitParams::Ownership ownership_;
 
   // Functions with the same name require the ui::WindowObserver to be in
   // 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_;
 
   // Aura configuration.
   std::unique_ptr<WindowTreeHostMus> window_tree_host_;
   aura::Window* content_;
   std::unique_ptr<wm::FocusController> focus_client_;
   std::unique_ptr<MusCaptureClient> capture_client_;
   std::unique_ptr<aura::client::DragDropClient> drag_drop_client_;
   std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_;
   std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
   std::unique_ptr<wm::CursorManager> cursor_manager_;
 
   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);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_