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

Side by Side Diff: ui/aura/mus/window_manager_delegate.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 | « no previous file | ui/aura/mus/window_tree_client.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_MANAGER_DELEGATE_H_ 5 #ifndef UI_AURA_MUS_WINDOW_MANAGER_DELEGATE_H_
6 #define UI_AURA_MUS_WINDOW_MANAGER_DELEGATE_H_ 6 #define UI_AURA_MUS_WINDOW_MANAGER_DELEGATE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/callback_forward.h" 15 #include "base/callback_forward.h"
16 #include "services/ui/public/interfaces/cursor.mojom.h" 16 #include "services/ui/public/interfaces/cursor.mojom.h"
17 #include "services/ui/public/interfaces/event_matcher.mojom.h" 17 #include "services/ui/public/interfaces/window_manager.mojom.h"
18 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 18 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
19 #include "services/ui/public/interfaces/window_tree_constants.mojom.h" 19 #include "services/ui/public/interfaces/window_tree_constants.mojom.h"
20 #include "ui/aura/aura_export.h" 20 #include "ui/aura/aura_export.h"
21 #include "ui/events/mojo/event.mojom.h" 21 #include "ui/events/mojo/event.mojom.h"
22 22
23 namespace display { 23 namespace display {
24 class Display; 24 class Display;
25 } 25 }
26 26
27 namespace gfx { 27 namespace gfx {
(...skipping 13 matching lines...) Expand all
41 41
42 // See the mojom with the same name for details on the functions in this 42 // See the mojom with the same name for details on the functions in this
43 // interface. 43 // interface.
44 class AURA_EXPORT WindowManagerClient { 44 class AURA_EXPORT WindowManagerClient {
45 public: 45 public:
46 virtual void SetFrameDecorationValues( 46 virtual void SetFrameDecorationValues(
47 ui::mojom::FrameDecorationValuesPtr values) = 0; 47 ui::mojom::FrameDecorationValuesPtr values) = 0;
48 virtual void SetNonClientCursor(Window* window, 48 virtual void SetNonClientCursor(Window* window,
49 ui::mojom::Cursor non_client_cursor) = 0; 49 ui::mojom::Cursor non_client_cursor) = 0;
50 50
51 virtual void AddAccelerator(uint32_t id, 51 virtual void AddAccelerators(
52 ui::mojom::EventMatcherPtr event_matcher, 52 std::vector<ui::mojom::AcceleratorPtr> accelerators,
53 const base::Callback<void(bool)>& callback) = 0; 53 const base::Callback<void(bool)>& callback) = 0;
54 virtual void RemoveAccelerator(uint32_t id) = 0; 54 virtual void RemoveAccelerator(uint32_t id) = 0;
55 virtual void AddActivationParent(Window* window) = 0; 55 virtual void AddActivationParent(Window* window) = 0;
56 virtual void RemoveActivationParent(Window* window) = 0; 56 virtual void RemoveActivationParent(Window* window) = 0;
57 virtual void ActivateNextWindow() = 0; 57 virtual void ActivateNextWindow() = 0;
58 virtual void SetUnderlaySurfaceOffsetAndExtendedHitArea( 58 virtual void SetUnderlaySurfaceOffsetAndExtendedHitArea(
59 Window* window, 59 Window* window,
60 const gfx::Vector2d& offset, 60 const gfx::Vector2d& offset,
61 const gfx::Insets& hit_area) = 0; 61 const gfx::Insets& hit_area) = 0;
62 62
63 // Requests the client embedded in |window| to close the window. Only 63 // Requests the client embedded in |window| to close the window. Only
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 const gfx::Insets& insets, 148 const gfx::Insets& insets,
149 const std::vector<gfx::Rect>& additional_client_areas) = 0; 149 const std::vector<gfx::Rect>& additional_client_areas) = 0;
150 150
151 protected: 151 protected:
152 virtual ~WindowManagerDelegate() {} 152 virtual ~WindowManagerDelegate() {}
153 }; 153 };
154 154
155 } // namespace ui 155 } // namespace ui
156 156
157 #endif // UI_AURA_MUS_WINDOW_MANAGER_DELEGATE_H_ 157 #endif // UI_AURA_MUS_WINDOW_MANAGER_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698