Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: ui/views/mus/native_widget_mus.h

Issue 2379073003: mus: Use TooltipManagerAura in NativeWidgetMus. (Closed)
Patch Set: Actually put that file in the right spot. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 5 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 6 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 namespace ui { 47 namespace ui {
48 class Event; 48 class Event;
49 } 49 }
50 50
51 namespace wm { 51 namespace wm {
52 class CursorManager; 52 class CursorManager;
53 class FocusController; 53 class FocusController;
54 } 54 }
55 55
56 namespace views { 56 namespace views {
57 namespace corewm {
58 class TooltipController;
59 }
57 class DropHelper; 60 class DropHelper;
58 class DropTargetMus; 61 class DropTargetMus;
62 class TooltipManagerAura;
59 class WidgetDelegate; 63 class WidgetDelegate;
60 64
61 // An implementation of NativeWidget that binds to a ui::Window. Because Aura 65 // An implementation of NativeWidget that binds to a ui::Window. Because Aura
62 // is used extensively within Views code, this code uses aura and binds to the 66 // is used extensively within Views code, this code uses aura and binds to the
63 // ui::Window via a Mus-specific aura::WindowTreeHost impl. Because the root 67 // ui::Window via a Mus-specific aura::WindowTreeHost impl. Because the root
64 // aura::Window in a hierarchy is created without a delegate by the 68 // aura::Window in a hierarchy is created without a delegate by the
65 // aura::WindowTreeHost, we must create a child aura::Window in this class 69 // aura::WindowTreeHost, we must create a child aura::Window in this class
66 // (content_) and attach it to the root. 70 // (content_) and attach it to the root.
67 class VIEWS_MUS_EXPORT NativeWidgetMus 71 class VIEWS_MUS_EXPORT NativeWidgetMus
68 : public internal::NativeWidgetPrivate, 72 : public internal::NativeWidgetPrivate,
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 std::unique_ptr<wm::FocusController> focus_client_; 297 std::unique_ptr<wm::FocusController> focus_client_;
294 std::unique_ptr<MusCaptureClient> capture_client_; 298 std::unique_ptr<MusCaptureClient> capture_client_;
295 std::unique_ptr<aura::client::DragDropClient> drag_drop_client_; 299 std::unique_ptr<aura::client::DragDropClient> drag_drop_client_;
296 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_; 300 std::unique_ptr<aura::client::WindowTreeClient> window_tree_client_;
297 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_; 301 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
298 std::unique_ptr<wm::CursorManager> cursor_manager_; 302 std::unique_ptr<wm::CursorManager> cursor_manager_;
299 303
300 std::unique_ptr<DropHelper> drop_helper_; 304 std::unique_ptr<DropHelper> drop_helper_;
301 int last_drop_operation_; 305 int last_drop_operation_;
302 306
307 std::unique_ptr<corewm::TooltipController> tooltip_controller_;
308 std::unique_ptr<TooltipManagerAura> tooltip_manager_;
309
303 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_; 310 base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
304 311
305 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus); 312 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
306 }; 313 };
307 314
308 } // namespace views 315 } // namespace views
309 316
310 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_ 317 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698