OLD | NEW |
---|---|
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 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
574 | 574 |
575 // A mapping to shared memory that is one 32 bit integer long. The window | 575 // A mapping to shared memory that is one 32 bit integer long. The window |
576 // server uses this to let us synchronously read the cursor location. | 576 // server uses this to let us synchronously read the cursor location. |
577 mojo::ScopedSharedBufferMapping cursor_location_mapping_; | 577 mojo::ScopedSharedBufferMapping cursor_location_mapping_; |
578 | 578 |
579 base::ObserverList<WindowTreeClientObserver> observers_; | 579 base::ObserverList<WindowTreeClientObserver> observers_; |
580 | 580 |
581 std::unique_ptr<mojo::AssociatedBinding<ui::mojom::WindowManager>> | 581 std::unique_ptr<mojo::AssociatedBinding<ui::mojom::WindowManager>> |
582 window_manager_internal_; | 582 window_manager_internal_; |
583 ui::mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_; | 583 ui::mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_; |
584 // Normally the same as |window_manager_internal_client_|. Tests typically | |
585 // run without a Connector, which means this (and | |
msw
2017/04/26 23:44:46
optional nit: service_manager::Connector
sky
2017/04/27 02:49:41
Done.
| |
586 // |window_manager_internal_client_) are null. Tests thata need to test | |
msw
2017/04/26 23:44:46
nit: '|' inside of ')', and s/thata/that/
sky
2017/04/27 02:49:41
Done.
| |
587 // WindowManagerClient set this, but not |window_manager_internal_client_|. | |
588 ui::mojom::WindowManagerClient* window_manager_client_ = nullptr; | |
584 | 589 |
585 bool has_pointer_watcher_ = false; | 590 bool has_pointer_watcher_ = false; |
586 | 591 |
587 // The current change id for the client. | 592 // The current change id for the client. |
588 uint32_t current_move_loop_change_ = 0u; | 593 uint32_t current_move_loop_change_ = 0u; |
589 | 594 |
590 // Callback executed when a move loop initiated by PerformWindowMove() is | 595 // Callback executed when a move loop initiated by PerformWindowMove() is |
591 // completed. | 596 // completed. |
592 base::Callback<void(bool)> on_current_move_finished_; | 597 base::Callback<void(bool)> on_current_move_finished_; |
593 | 598 |
(...skipping 24 matching lines...) Expand all Loading... | |
618 gfx::Insets normal_client_area_insets_; | 623 gfx::Insets normal_client_area_insets_; |
619 | 624 |
620 base::WeakPtrFactory<WindowTreeClient> weak_factory_; | 625 base::WeakPtrFactory<WindowTreeClient> weak_factory_; |
621 | 626 |
622 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); | 627 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); |
623 }; | 628 }; |
624 | 629 |
625 } // namespace aura | 630 } // namespace aura |
626 | 631 |
627 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ | 632 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ |
OLD | NEW |