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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/window_manager_delegate.h
diff --git a/ui/aura/mus/window_manager_delegate.h b/ui/aura/mus/window_manager_delegate.h
index 4d1353974717514b37be5c4137ac106a42744260..0dc8d6186712b1d15616733c10b6d871987a1b90 100644
--- a/ui/aura/mus/window_manager_delegate.h
+++ b/ui/aura/mus/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/aura/aura_export.h"
@@ -48,9 +48,9 @@ class AURA_EXPORT WindowManagerClient {
virtual void SetNonClientCursor(Window* window,
ui::mojom::Cursor non_client_cursor) = 0;
- virtual void AddAccelerator(uint32_t id,
- ui::mojom::EventMatcherPtr event_matcher,
- const base::Callback<void(bool)>& callback) = 0;
+ virtual void AddAccelerators(
+ std::vector<ui::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 | « 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