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

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

Issue 2552783002: In aura mus, WindowManagerClient::AddAccelerator() should take an array. (Closed)
Patch Set: Remove unused include. 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 | « ui/aura/mus/window_manager_delegate.h ('k') | ui/aura/mus/window_tree_client.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 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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 const gfx::Point& cursor_location) override; 392 const gfx::Point& cursor_location) override;
393 void WmCancelMoveLoop(uint32_t window_id) override; 393 void WmCancelMoveLoop(uint32_t window_id) override;
394 void OnAccelerator(uint32_t ack_id, 394 void OnAccelerator(uint32_t ack_id,
395 uint32_t accelerator_id, 395 uint32_t accelerator_id,
396 std::unique_ptr<ui::Event> event) override; 396 std::unique_ptr<ui::Event> event) override;
397 397
398 // Overridden from WindowManagerClient: 398 // Overridden from WindowManagerClient:
399 void SetFrameDecorationValues( 399 void SetFrameDecorationValues(
400 ui::mojom::FrameDecorationValuesPtr values) override; 400 ui::mojom::FrameDecorationValuesPtr values) override;
401 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override; 401 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override;
402 void AddAccelerator(uint32_t id, 402 void AddAccelerators(std::vector<ui::mojom::AcceleratorPtr> accelerators,
403 ui::mojom::EventMatcherPtr event_matcher, 403 const base::Callback<void(bool)>& callback) override;
404 const base::Callback<void(bool)>& callback) override;
405 void RemoveAccelerator(uint32_t id) override; 404 void RemoveAccelerator(uint32_t id) override;
406 void AddActivationParent(Window* window) override; 405 void AddActivationParent(Window* window) override;
407 void RemoveActivationParent(Window* window) override; 406 void RemoveActivationParent(Window* window) override;
408 void ActivateNextWindow() override; 407 void ActivateNextWindow() override;
409 void SetUnderlaySurfaceOffsetAndExtendedHitArea( 408 void SetUnderlaySurfaceOffsetAndExtendedHitArea(
410 Window* window, 409 Window* window,
411 const gfx::Vector2d& offset, 410 const gfx::Vector2d& offset,
412 const gfx::Insets& hit_area) override; 411 const gfx::Insets& hit_area) override;
413 void RequestClose(Window* window) override; 412 void RequestClose(Window* window) override;
414 413
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 std::unique_ptr<DragDropControllerMus> drag_drop_controller_; 515 std::unique_ptr<DragDropControllerMus> drag_drop_controller_;
517 516
518 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 517 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
519 518
520 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 519 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
521 }; 520 };
522 521
523 } // namespace aura 522 } // namespace aura
524 523
525 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 524 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/window_manager_delegate.h ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698