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

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

Issue 2754593003: Renames ui::mojom::Accelerator to ui::mojom::WmAccelerator (Closed)
Patch Set: Created 3 years, 9 months 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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 void WmStackAbove(uint32_t change_id, Id above_id, Id below_id) override; 421 void WmStackAbove(uint32_t change_id, Id above_id, Id below_id) override;
422 void WmStackAtTop(uint32_t change_id, uint32_t window_id) override; 422 void WmStackAtTop(uint32_t change_id, uint32_t window_id) override;
423 void OnAccelerator(uint32_t ack_id, 423 void OnAccelerator(uint32_t ack_id,
424 uint32_t accelerator_id, 424 uint32_t accelerator_id,
425 std::unique_ptr<ui::Event> event) override; 425 std::unique_ptr<ui::Event> event) override;
426 426
427 // Overridden from WindowManagerClient: 427 // Overridden from WindowManagerClient:
428 void SetFrameDecorationValues( 428 void SetFrameDecorationValues(
429 ui::mojom::FrameDecorationValuesPtr values) override; 429 ui::mojom::FrameDecorationValuesPtr values) override;
430 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override; 430 void SetNonClientCursor(Window* window, ui::mojom::Cursor cursor_id) override;
431 void AddAccelerators(std::vector<ui::mojom::AcceleratorPtr> accelerators, 431 void AddAccelerators(std::vector<ui::mojom::WmAcceleratorPtr> accelerators,
432 const base::Callback<void(bool)>& callback) override; 432 const base::Callback<void(bool)>& callback) override;
433 void RemoveAccelerator(uint32_t id) override; 433 void RemoveAccelerator(uint32_t id) override;
434 void AddActivationParent(Window* window) override; 434 void AddActivationParent(Window* window) override;
435 void RemoveActivationParent(Window* window) override; 435 void RemoveActivationParent(Window* window) override;
436 void ActivateNextWindow() override; 436 void ActivateNextWindow() override;
437 void SetExtendedHitArea(Window* window, const gfx::Insets& hit_area) override; 437 void SetExtendedHitArea(Window* window, const gfx::Insets& hit_area) override;
438 void RequestClose(Window* window) override; 438 void RequestClose(Window* window) override;
439 439
440 // Overriden from WindowTreeHostMusDelegate: 440 // Overriden from WindowTreeHostMusDelegate:
441 void OnWindowTreeHostBoundsWillChange(WindowTreeHostMus* window_tree_host, 441 void OnWindowTreeHostBoundsWillChange(WindowTreeHostMus* window_tree_host,
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 // ContextFactory that was set on Env originally. 569 // ContextFactory that was set on Env originally.
570 ui::ContextFactory* initial_context_factory_ = nullptr; 570 ui::ContextFactory* initial_context_factory_ = nullptr;
571 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 571 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
572 572
573 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 573 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
574 }; 574 };
575 575
576 } // namespace aura 576 } // namespace aura
577 577
578 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 578 #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