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

Side by Side Diff: services/ui/public/cpp/window_tree_client.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
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_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ 5 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
6 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ 6 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 const gfx::Point& cursor_location) override; 390 const gfx::Point& cursor_location) override;
391 void WmCancelMoveLoop(uint32_t window_id) override; 391 void WmCancelMoveLoop(uint32_t window_id) override;
392 void OnAccelerator(uint32_t ack_id, 392 void OnAccelerator(uint32_t ack_id,
393 uint32_t accelerator_id, 393 uint32_t accelerator_id,
394 std::unique_ptr<ui::Event> event) override; 394 std::unique_ptr<ui::Event> event) override;
395 395
396 // Overridden from WindowManagerClient: 396 // Overridden from WindowManagerClient:
397 void SetFrameDecorationValues( 397 void SetFrameDecorationValues(
398 mojom::FrameDecorationValuesPtr values) override; 398 mojom::FrameDecorationValuesPtr values) override;
399 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override; 399 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override;
400 void AddAccelerator(uint32_t id, 400 void AddAccelerators(std::vector<mojom::AcceleratorPtr> accelerators,
401 mojom::EventMatcherPtr event_matcher, 401 const base::Callback<void(bool)>& callback) override;
402 const base::Callback<void(bool)>& callback) override;
403 void RemoveAccelerator(uint32_t id) override; 402 void RemoveAccelerator(uint32_t id) override;
404 void AddActivationParent(Window* window) override; 403 void AddActivationParent(Window* window) override;
405 void RemoveActivationParent(Window* window) override; 404 void RemoveActivationParent(Window* window) override;
406 void ActivateNextWindow() override; 405 void ActivateNextWindow() override;
407 void SetUnderlaySurfaceOffsetAndExtendedHitArea( 406 void SetUnderlaySurfaceOffsetAndExtendedHitArea(
408 Window* window, 407 Window* window,
409 const gfx::Vector2d& offset, 408 const gfx::Vector2d& offset,
410 const gfx::Insets& hit_area) override; 409 const gfx::Insets& hit_area) override;
411 410
412 // The one int in |cursor_location_mapping_|. When we read from this 411 // The one int in |cursor_location_mapping_|. When we read from this
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 std::set<Id> drag_entered_windows_; 488 std::set<Id> drag_entered_windows_;
490 489
491 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 490 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
492 491
493 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 492 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
494 }; 493 };
495 494
496 } // namespace ui 495 } // namespace ui
497 496
498 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ 497 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
OLDNEW
« no previous file with comments | « services/ui/public/cpp/window_manager_delegate.h ('k') | services/ui/public/cpp/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698