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

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

Issue 2652713003: aura-mus: Make StackAtTop() proxy to the window manager. (Closed)
Patch Set: Add explicit bails in WmStackAtTop. 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
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 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 const std::unordered_map<std::string, std::vector<uint8_t>>& 402 const std::unordered_map<std::string, std::vector<uint8_t>>&
403 transport_properties) override; 403 transport_properties) override;
404 void WmClientJankinessChanged(ClientSpecificId client_id, 404 void WmClientJankinessChanged(ClientSpecificId client_id,
405 bool janky) override; 405 bool janky) override;
406 void WmPerformMoveLoop(uint32_t change_id, 406 void WmPerformMoveLoop(uint32_t change_id,
407 Id window_id, 407 Id window_id,
408 ui::mojom::MoveLoopSource source, 408 ui::mojom::MoveLoopSource source,
409 const gfx::Point& cursor_location) override; 409 const gfx::Point& cursor_location) override;
410 void WmCancelMoveLoop(uint32_t window_id) override; 410 void WmCancelMoveLoop(uint32_t window_id) override;
411 void WmDeactivateWindow(Id window_id) override; 411 void WmDeactivateWindow(Id window_id) override;
412 void WmStackAtTop(uint32_t change_id, uint32_t window_id) override;
412 void OnAccelerator(uint32_t ack_id, 413 void OnAccelerator(uint32_t ack_id,
413 uint32_t accelerator_id, 414 uint32_t accelerator_id,
414 std::unique_ptr<ui::Event> event) override; 415 std::unique_ptr<ui::Event> event) override;
415 416
416 // Overridden from WindowManagerClient: 417 // Overridden from WindowManagerClient:
417 void SetFrameDecorationValues( 418 void SetFrameDecorationValues(
418 ui::mojom::FrameDecorationValuesPtr values) override; 419 ui::mojom::FrameDecorationValuesPtr values) override;
419 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override; 420 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override;
420 void AddAccelerators(std::vector<ui::mojom::AcceleratorPtr> accelerators, 421 void AddAccelerators(std::vector<ui::mojom::AcceleratorPtr> accelerators,
421 const base::Callback<void(bool)>& callback) override; 422 const base::Callback<void(bool)>& callback) override;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 ui::mojom::WindowTreePtr tree_ptr_; 504 ui::mojom::WindowTreePtr tree_ptr_;
504 // Typically this is the value contained in |tree_ptr_|, but tests may 505 // Typically this is the value contained in |tree_ptr_|, but tests may
505 // directly set this. 506 // directly set this.
506 ui::mojom::WindowTree* tree_; 507 ui::mojom::WindowTree* tree_;
507 508
508 // Set to true if OnEmbed() was received. 509 // Set to true if OnEmbed() was received.
509 bool is_from_embed_ = false; 510 bool is_from_embed_ = false;
510 511
511 bool in_destructor_; 512 bool in_destructor_;
512 513
514 // Maps from a change id to a window manager change id which caused it.
515 std::map<uint32_t, uint32_t> in_flight_change_map_;
516
513 // A mapping to shared memory that is one 32 bit integer long. The window 517 // A mapping to shared memory that is one 32 bit integer long. The window
514 // server uses this to let us synchronously read the cursor location. 518 // server uses this to let us synchronously read the cursor location.
515 mojo::ScopedSharedBufferMapping cursor_location_mapping_; 519 mojo::ScopedSharedBufferMapping cursor_location_mapping_;
516 520
517 base::ObserverList<WindowTreeClientObserver> observers_; 521 base::ObserverList<WindowTreeClientObserver> observers_;
518 522
519 std::unique_ptr<mojo::AssociatedBinding<ui::mojom::WindowManager>> 523 std::unique_ptr<mojo::AssociatedBinding<ui::mojom::WindowManager>>
520 window_manager_internal_; 524 window_manager_internal_;
521 ui::mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_; 525 ui::mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_;
522 526
(...skipping 17 matching lines...) Expand all
540 std::unique_ptr<ui::Gpu> gpu_; 544 std::unique_ptr<ui::Gpu> gpu_;
541 std::unique_ptr<MusContextFactory> compositor_context_factory_; 545 std::unique_ptr<MusContextFactory> compositor_context_factory_;
542 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 546 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
543 547
544 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 548 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
545 }; 549 };
546 550
547 } // namespace aura 551 } // namespace aura
548 552
549 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 553 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698