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

Side by Side Diff: components/mus/public/cpp/lib/window_tree_client_impl.h

Issue 1656123002: Moves accelerator registration to WindowManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mandoline Created 4 years, 10 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 | « no previous file | components/mus/public/cpp/lib/window_tree_client_impl.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 COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_ 5 #ifndef COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_
6 #define COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_ 6 #define COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 void WmSetBounds(uint32_t change_id, 220 void WmSetBounds(uint32_t change_id,
221 Id window_id, 221 Id window_id,
222 mojo::RectPtr transit_bounds) override; 222 mojo::RectPtr transit_bounds) override;
223 void WmSetProperty(uint32_t change_id, 223 void WmSetProperty(uint32_t change_id,
224 Id window_id, 224 Id window_id,
225 const mojo::String& name, 225 const mojo::String& name,
226 mojo::Array<uint8_t> transit_data) override; 226 mojo::Array<uint8_t> transit_data) override;
227 void WmCreateTopLevelWindow(uint32_t change_id, 227 void WmCreateTopLevelWindow(uint32_t change_id,
228 mojo::Map<mojo::String, mojo::Array<uint8_t>> 228 mojo::Map<mojo::String, mojo::Array<uint8_t>>
229 transport_properties) override; 229 transport_properties) override;
230 void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override;
230 231
231 // Overriden from WindowManagerClient: 232 // Overriden from WindowManagerClient:
232 void SetFrameDecorationValues( 233 void SetFrameDecorationValues(
233 mojom::FrameDecorationValuesPtr values) override; 234 mojom::FrameDecorationValuesPtr values) override;
235 void AddAccelerator(uint32_t id,
236 mojom::EventMatcherPtr event_matcher,
237 const base::Callback<void(bool)>& callback) override;
238 void RemoveAccelerator(uint32_t id) override;
234 239
235 // This is set once and only once when we get OnEmbed(). It gives the unique 240 // This is set once and only once when we get OnEmbed(). It gives the unique
236 // id for this connection. 241 // id for this connection.
237 ConnectionSpecificId connection_id_; 242 ConnectionSpecificId connection_id_;
238 243
239 // Id assigned to the next window created. 244 // Id assigned to the next window created.
240 ConnectionSpecificId next_window_id_; 245 ConnectionSpecificId next_window_id_;
241 246
242 // Id used for the next change id supplied to the server. 247 // Id used for the next change id supplied to the server.
243 uint32_t next_change_id_; 248 uint32_t next_change_id_;
(...skipping 26 matching lines...) Expand all
270 scoped_ptr<mojo::AssociatedBinding<mojom::WindowManager>> 275 scoped_ptr<mojo::AssociatedBinding<mojom::WindowManager>>
271 window_manager_internal_; 276 window_manager_internal_;
272 mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_; 277 mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_;
273 278
274 MOJO_DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImpl); 279 MOJO_DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImpl);
275 }; 280 };
276 281
277 } // namespace mus 282 } // namespace mus
278 283
279 #endif // COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_ 284 #endif // COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | components/mus/public/cpp/lib/window_tree_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698