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/public/cpp/window_tree_client.h

Issue 2520093003: WindowManagerClient::AddAccelerator() should take an array (Closed)
Patch Set: Forget to add these files to previous patch. Created 4 years, 1 month 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 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 const gfx::Point& cursor_location) override; 386 const gfx::Point& cursor_location) override;
387 void WmCancelMoveLoop(uint32_t window_id) override; 387 void WmCancelMoveLoop(uint32_t window_id) override;
388 void OnAccelerator(uint32_t ack_id, 388 void OnAccelerator(uint32_t ack_id,
389 uint32_t accelerator_id, 389 uint32_t accelerator_id,
390 std::unique_ptr<ui::Event> event) override; 390 std::unique_ptr<ui::Event> event) override;
391 391
392 // Overridden from WindowManagerClient: 392 // Overridden from WindowManagerClient:
393 void SetFrameDecorationValues( 393 void SetFrameDecorationValues(
394 mojom::FrameDecorationValuesPtr values) override; 394 mojom::FrameDecorationValuesPtr values) override;
395 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override; 395 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override;
396 void AddAccelerator(uint32_t id, 396 void AddAccelerator(mojo::Array<mojom::AcceleratorEventPtr> accelerator_event,
397 mojom::EventMatcherPtr event_matcher,
398 const base::Callback<void(bool)>& callback) override; 397 const base::Callback<void(bool)>& callback) override;
399 void RemoveAccelerator(uint32_t id) override; 398 void RemoveAccelerator(uint32_t id) override;
400 void AddActivationParent(Window* window) override; 399 void AddActivationParent(Window* window) override;
401 void RemoveActivationParent(Window* window) override; 400 void RemoveActivationParent(Window* window) override;
402 void ActivateNextWindow() override; 401 void ActivateNextWindow() override;
403 void SetUnderlaySurfaceOffsetAndExtendedHitArea( 402 void SetUnderlaySurfaceOffsetAndExtendedHitArea(
404 Window* window, 403 Window* window,
405 const gfx::Vector2d& offset, 404 const gfx::Vector2d& offset,
406 const gfx::Insets& hit_area) override; 405 const gfx::Insets& hit_area) override;
407 406
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 std::set<Id> drag_entered_windows_; 483 std::set<Id> drag_entered_windows_;
485 484
486 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 485 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
487 486
488 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 487 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
489 }; 488 };
490 489
491 } // namespace ui 490 } // namespace ui
492 491
493 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_ 492 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698