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

Side by Side Diff: services/ui/public/cpp/window_manager_delegate.h

Issue 2520093003: WindowManagerClient::AddAccelerator() should take an array (Closed)
Patch Set: Adding 1 test that has two unique and one duped accelerators. 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 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 SERVICES_UI_PUBLIC_CPP_WINDOW_MANAGER_DELEGATE_H_ 5 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_MANAGER_DELEGATE_H_
6 #define SERVICES_UI_PUBLIC_CPP_WINDOW_MANAGER_DELEGATE_H_ 6 #define SERVICES_UI_PUBLIC_CPP_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/events/mojo/event.mojom.h" 20 #include "ui/events/mojo/event.mojom.h"
21 21
22 namespace display { 22 namespace display {
23 class Display; 23 class Display;
24 } 24 }
25 25
26 namespace gfx { 26 namespace gfx {
27 class Insets; 27 class Insets;
(...skipping 11 matching lines...) Expand all
39 39
40 // See the mojom with the same name for details on the functions in this 40 // See the mojom with the same name for details on the functions in this
41 // interface. 41 // interface.
42 class WindowManagerClient { 42 class WindowManagerClient {
43 public: 43 public:
44 virtual void SetFrameDecorationValues( 44 virtual void SetFrameDecorationValues(
45 mojom::FrameDecorationValuesPtr values) = 0; 45 mojom::FrameDecorationValuesPtr values) = 0;
46 virtual void SetNonClientCursor(Window* window, 46 virtual void SetNonClientCursor(Window* window,
47 mojom::Cursor non_client_cursor) = 0; 47 mojom::Cursor non_client_cursor) = 0;
48 48
49 virtual void AddAccelerator(uint32_t id, 49 virtual void AddAccelerators(std::vector<mojom::AcceleratorPtr> accelerators,
50 mojom::EventMatcherPtr event_matcher, 50 const base::Callback<void(bool)>& callback) = 0;
51 const base::Callback<void(bool)>& callback) = 0;
52 virtual void RemoveAccelerator(uint32_t id) = 0; 51 virtual void RemoveAccelerator(uint32_t id) = 0;
53 virtual void AddActivationParent(Window* window) = 0; 52 virtual void AddActivationParent(Window* window) = 0;
54 virtual void RemoveActivationParent(Window* window) = 0; 53 virtual void RemoveActivationParent(Window* window) = 0;
55 virtual void ActivateNextWindow() = 0; 54 virtual void ActivateNextWindow() = 0;
56 virtual void SetUnderlaySurfaceOffsetAndExtendedHitArea( 55 virtual void SetUnderlaySurfaceOffsetAndExtendedHitArea(
57 Window* window, 56 Window* window,
58 const gfx::Vector2d& offset, 57 const gfx::Vector2d& offset,
59 const gfx::Insets& hit_area) = 0; 58 const gfx::Insets& hit_area) = 0;
60 59
61 protected: 60 protected:
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 121
123 virtual void OnWmCancelMoveLoop(Window* window) = 0; 122 virtual void OnWmCancelMoveLoop(Window* window) = 0;
124 123
125 protected: 124 protected:
126 virtual ~WindowManagerDelegate() {} 125 virtual ~WindowManagerDelegate() {}
127 }; 126 };
128 127
129 } // namespace ui 128 } // namespace ui
130 129
131 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_MANAGER_DELEGATE_H_ 130 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_MANAGER_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698