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: services/ui/ws/window_tree.h

Issue 2520093003: WindowManagerClient::AddAccelerator() should take an array (Closed)
Patch Set: Use std::move instead of Clone() Created 4 years 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 | « services/ui/ws/window_manager_state_unittest.cc ('k') | services/ui/ws/window_tree.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 SERVICES_UI_WS_WINDOW_TREE_H_ 5 #ifndef SERVICES_UI_WS_WINDOW_TREE_H_
6 #define SERVICES_UI_WS_WINDOW_TREE_H_ 6 #define SERVICES_UI_WS_WINDOW_TREE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data, 460 const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data,
461 uint32_t drag_operation) override; 461 uint32_t drag_operation) override;
462 void CancelDragDrop(Id window_id) override; 462 void CancelDragDrop(Id window_id) override;
463 void PerformWindowMove(uint32_t change_id, 463 void PerformWindowMove(uint32_t change_id,
464 Id window_id, 464 Id window_id,
465 ui::mojom::MoveLoopSource source, 465 ui::mojom::MoveLoopSource source,
466 const gfx::Point& cursor) override; 466 const gfx::Point& cursor) override;
467 void CancelWindowMove(Id window_id) override; 467 void CancelWindowMove(Id window_id) override;
468 468
469 // mojom::WindowManagerClient: 469 // mojom::WindowManagerClient:
470 void AddAccelerator(uint32_t id, 470 void AddAccelerators(std::vector<mojom::AcceleratorPtr> accelerators,
471 mojom::EventMatcherPtr event_matcher, 471 const AddAcceleratorsCallback& callback) override;
472 const AddAcceleratorCallback& callback) override;
473 void RemoveAccelerator(uint32_t id) override; 472 void RemoveAccelerator(uint32_t id) override;
474 void AddActivationParent(Id transport_window_id) override; 473 void AddActivationParent(Id transport_window_id) override;
475 void RemoveActivationParent(Id transport_window_id) override; 474 void RemoveActivationParent(Id transport_window_id) override;
476 void ActivateNextWindow() override; 475 void ActivateNextWindow() override;
477 void SetUnderlaySurfaceOffsetAndExtendedHitArea( 476 void SetUnderlaySurfaceOffsetAndExtendedHitArea(
478 Id window_id, 477 Id window_id,
479 int32_t x_offset, 478 int32_t x_offset,
480 int32_t y_offset, 479 int32_t y_offset,
481 const gfx::Insets& hit_area) override; 480 const gfx::Insets& hit_area) override;
482 void WmResponse(uint32_t change_id, bool response) override; 481 void WmResponse(uint32_t change_id, bool response) override;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 waiting_for_top_level_window_info_; 580 waiting_for_top_level_window_info_;
582 bool embedder_intercepts_events_ = false; 581 bool embedder_intercepts_events_ = false;
583 582
584 DISALLOW_COPY_AND_ASSIGN(WindowTree); 583 DISALLOW_COPY_AND_ASSIGN(WindowTree);
585 }; 584 };
586 585
587 } // namespace ws 586 } // namespace ws
588 } // namespace ui 587 } // namespace ui
589 588
590 #endif // SERVICES_UI_WS_WINDOW_TREE_H_ 589 #endif // SERVICES_UI_WS_WINDOW_TREE_H_
OLDNEW
« no previous file with comments | « services/ui/ws/window_manager_state_unittest.cc ('k') | services/ui/ws/window_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698