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

Side by Side Diff: ui/aura/mus/window_tree_client.h

Issue 2633233003: aura-mus: Implement stacking in DesktopWindowTreeHostMus. (Closed)
Patch Set: Reword comment. Created 3 years, 11 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
« no previous file with comments | « ui/aura/BUILD.gn ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_AURA_MUS_WINDOW_TREE_CLIENT_H_ 5 #ifndef UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 class InFlightFocusChange; 55 class InFlightFocusChange;
56 class InFlightPropertyChange; 56 class InFlightPropertyChange;
57 class InFlightVisibleChange; 57 class InFlightVisibleChange;
58 class MusContextFactory; 58 class MusContextFactory;
59 class WindowMus; 59 class WindowMus;
60 class WindowPortMus; 60 class WindowPortMus;
61 struct WindowPortPropertyData; 61 struct WindowPortPropertyData;
62 class WindowTreeClientDelegate; 62 class WindowTreeClientDelegate;
63 class WindowTreeClientPrivate; 63 class WindowTreeClientPrivate;
64 class WindowTreeClientObserver; 64 class WindowTreeClientObserver;
65 class WindowTreeClientTestObserver;
65 class WindowTreeHostMus; 66 class WindowTreeHostMus;
66 67
67 namespace client { 68 namespace client {
68 class CaptureClient; 69 class CaptureClient;
69 } 70 }
70 71
71 using EventResultCallback = base::Callback<void(ui::mojom::EventResult)>; 72 using EventResultCallback = base::Callback<void(ui::mojom::EventResult)>;
72 73
73 // Manages the connection with mus. 74 // Manages the connection with mus.
74 // 75 //
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 const gfx::Point& cursor_location, 162 const gfx::Point& cursor_location,
162 const base::Callback<void(bool)>& callback); 163 const base::Callback<void(bool)>& callback);
163 164
164 // Cancels a in progress window move. (If no window is currently being moved, 165 // Cancels a in progress window move. (If no window is currently being moved,
165 // does nothing.) 166 // does nothing.)
166 void CancelWindowMove(Window* window); 167 void CancelWindowMove(Window* window);
167 168
168 void AddObserver(WindowTreeClientObserver* observer); 169 void AddObserver(WindowTreeClientObserver* observer);
169 void RemoveObserver(WindowTreeClientObserver* observer); 170 void RemoveObserver(WindowTreeClientObserver* observer);
170 171
172 void AddTestObserver(WindowTreeClientTestObserver* observer);
173 void RemoveTestObserver(WindowTreeClientTestObserver* observer);
174
171 private: 175 private:
172 friend class InFlightBoundsChange; 176 friend class InFlightBoundsChange;
173 friend class InFlightFocusChange; 177 friend class InFlightFocusChange;
174 friend class InFlightPropertyChange; 178 friend class InFlightPropertyChange;
175 friend class InFlightVisibleChange; 179 friend class InFlightVisibleChange;
176 friend class WindowPortMus; 180 friend class WindowPortMus;
177 friend class WindowTreeClientPrivate; 181 friend class WindowTreeClientPrivate;
178 182
179 enum class Origin { 183 enum class Origin {
180 CLIENT, 184 CLIENT,
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 const gfx::Rect& bounds) override; 434 const gfx::Rect& bounds) override;
431 void OnWindowTreeHostClientAreaWillChange( 435 void OnWindowTreeHostClientAreaWillChange(
432 WindowTreeHostMus* window_tree_host, 436 WindowTreeHostMus* window_tree_host,
433 const gfx::Insets& client_area, 437 const gfx::Insets& client_area,
434 const std::vector<gfx::Rect>& additional_client_areas) override; 438 const std::vector<gfx::Rect>& additional_client_areas) override;
435 void OnWindowTreeHostHitTestMaskWillChange( 439 void OnWindowTreeHostHitTestMaskWillChange(
436 WindowTreeHostMus* window_tree_host, 440 WindowTreeHostMus* window_tree_host,
437 const base::Optional<gfx::Rect>& mask_rect) override; 441 const base::Optional<gfx::Rect>& mask_rect) override;
438 void OnWindowTreeHostDeactivateWindow( 442 void OnWindowTreeHostDeactivateWindow(
439 WindowTreeHostMus* window_tree_host) override; 443 WindowTreeHostMus* window_tree_host) override;
444 void OnWindowTreeHostStackAtTop(WindowTreeHostMus* window_tree_host) override;
440 std::unique_ptr<WindowPortMus> CreateWindowPortForTopLevel( 445 std::unique_ptr<WindowPortMus> CreateWindowPortForTopLevel(
441 const std::map<std::string, std::vector<uint8_t>>* properties) override; 446 const std::map<std::string, std::vector<uint8_t>>* properties) override;
442 void OnWindowTreeHostCreated(WindowTreeHostMus* window_tree_host) override; 447 void OnWindowTreeHostCreated(WindowTreeHostMus* window_tree_host) override;
443 448
444 // Override from client::TransientWindowClientObserver: 449 // Override from client::TransientWindowClientObserver:
445 void OnTransientChildWindowAdded(Window* parent, 450 void OnTransientChildWindowAdded(Window* parent,
446 Window* transient_child) override; 451 Window* transient_child) override;
447 void OnTransientChildWindowRemoved(Window* parent, 452 void OnTransientChildWindowRemoved(Window* parent,
448 Window* transient_child) override; 453 Window* transient_child) override;
449 void OnWillRestackTransientChildAbove(Window* parent, 454 void OnWillRestackTransientChildAbove(Window* parent,
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 // Callback executed when a move loop initiated by PerformWindowMove() is 528 // Callback executed when a move loop initiated by PerformWindowMove() is
524 // completed. 529 // completed.
525 base::Callback<void(bool)> on_current_move_finished_; 530 base::Callback<void(bool)> on_current_move_finished_;
526 531
527 // The current change id for the window manager. 532 // The current change id for the window manager.
528 uint32_t current_wm_move_loop_change_ = 0u; 533 uint32_t current_wm_move_loop_change_ = 0u;
529 Id current_wm_move_loop_window_id_ = 0u; 534 Id current_wm_move_loop_window_id_ = 0u;
530 535
531 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; 536 std::unique_ptr<DragDropControllerMus> drag_drop_controller_;
532 537
538 base::ObserverList<WindowTreeClientTestObserver> test_observers_;
539
533 std::unique_ptr<ui::Gpu> gpu_; 540 std::unique_ptr<ui::Gpu> gpu_;
534 std::unique_ptr<MusContextFactory> compositor_context_factory_; 541 std::unique_ptr<MusContextFactory> compositor_context_factory_;
535 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 542 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
536 543
537 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 544 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
538 }; 545 };
539 546
540 } // namespace aura 547 } // namespace aura
541 548
542 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 549 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/aura/BUILD.gn ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698