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

Unified Diff: services/ui/public/cpp/window_manager_delegate.h

Issue 2520093003: WindowManagerClient::AddAccelerator() should take an array (Closed)
Patch Set: Use std::move instead of Clone() 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/common/event_matcher_util.cc ('k') | services/ui/public/cpp/window_tree_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/public/cpp/window_manager_delegate.h
diff --git a/services/ui/public/cpp/window_manager_delegate.h b/services/ui/public/cpp/window_manager_delegate.h
index 2f724fc877fe9646be6ea52adc7f75ce30ea7b8d..51de4329f176f13a6af0d69432e57ddea6ce668a 100644
--- a/services/ui/public/cpp/window_manager_delegate.h
+++ b/services/ui/public/cpp/window_manager_delegate.h
@@ -14,7 +14,7 @@
#include "base/callback_forward.h"
#include "services/ui/public/interfaces/cursor.mojom.h"
-#include "services/ui/public/interfaces/event_matcher.mojom.h"
+#include "services/ui/public/interfaces/window_manager.mojom.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "services/ui/public/interfaces/window_tree_constants.mojom.h"
#include "ui/events/mojo/event.mojom.h"
@@ -46,9 +46,8 @@ class WindowManagerClient {
virtual void SetNonClientCursor(Window* window,
mojom::Cursor non_client_cursor) = 0;
- virtual void AddAccelerator(uint32_t id,
- mojom::EventMatcherPtr event_matcher,
- const base::Callback<void(bool)>& callback) = 0;
+ virtual void AddAccelerators(std::vector<mojom::AcceleratorPtr> accelerators,
+ const base::Callback<void(bool)>& callback) = 0;
virtual void RemoveAccelerator(uint32_t id) = 0;
virtual void AddActivationParent(Window* window) = 0;
virtual void RemoveActivationParent(Window* window) = 0;
« no previous file with comments | « services/ui/common/event_matcher_util.cc ('k') | services/ui/public/cpp/window_tree_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698