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

Side by Side Diff: services/ui/ws/window_tree.h

Issue 2520093003: WindowManagerClient::AddAccelerator() should take an array (Closed)
Patch Set: Forget to add these files to previous patch. 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
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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 mojo::Map<mojo::String, mojo::Array<uint8_t>> drag_data, 456 mojo::Map<mojo::String, mojo::Array<uint8_t>> drag_data,
457 uint32_t drag_operation) override; 457 uint32_t drag_operation) override;
458 void CancelDragDrop(Id window_id) override; 458 void CancelDragDrop(Id window_id) override;
459 void PerformWindowMove(uint32_t change_id, 459 void PerformWindowMove(uint32_t change_id,
460 Id window_id, 460 Id window_id,
461 ui::mojom::MoveLoopSource source, 461 ui::mojom::MoveLoopSource source,
462 const gfx::Point& cursor) override; 462 const gfx::Point& cursor) override;
463 void CancelWindowMove(Id window_id) override; 463 void CancelWindowMove(Id window_id) override;
464 464
465 // mojom::WindowManagerClient: 465 // mojom::WindowManagerClient:
466 void AddAccelerator(uint32_t id, 466 void AddAccelerator(
467 mojom::EventMatcherPtr event_matcher, 467 mojo::Array<mojom::AcceleratorEventPtr> multi_accelerators,
468 const AddAcceleratorCallback& callback) override; 468 const AddAcceleratorCallback& callback) override;
469 void RemoveAccelerator(uint32_t id) override; 469 void RemoveAccelerator(uint32_t id) override;
470 void AddActivationParent(Id transport_window_id) override; 470 void AddActivationParent(Id transport_window_id) override;
471 void RemoveActivationParent(Id transport_window_id) override; 471 void RemoveActivationParent(Id transport_window_id) override;
472 void ActivateNextWindow() override; 472 void ActivateNextWindow() override;
473 void SetUnderlaySurfaceOffsetAndExtendedHitArea( 473 void SetUnderlaySurfaceOffsetAndExtendedHitArea(
474 Id window_id, 474 Id window_id,
475 int32_t x_offset, 475 int32_t x_offset,
476 int32_t y_offset, 476 int32_t y_offset,
477 const gfx::Insets& hit_area) override; 477 const gfx::Insets& hit_area) override;
478 void WmResponse(uint32_t change_id, bool response) override; 478 void WmResponse(uint32_t change_id, bool response) override;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 waiting_for_top_level_window_info_; 577 waiting_for_top_level_window_info_;
578 bool embedder_intercepts_events_ = false; 578 bool embedder_intercepts_events_ = false;
579 579
580 DISALLOW_COPY_AND_ASSIGN(WindowTree); 580 DISALLOW_COPY_AND_ASSIGN(WindowTree);
581 }; 581 };
582 582
583 } // namespace ws 583 } // namespace ws
584 } // namespace ui 584 } // namespace ui
585 585
586 #endif // SERVICES_UI_WS_WINDOW_TREE_H_ 586 #endif // SERVICES_UI_WS_WINDOW_TREE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698