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

Side by Side Diff: mash/app_driver/app_driver.h

Issue 1939133002: StructTraits to map mus::mojom::Event to unique_ptr<ui::Event> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed feedback. Created 4 years, 6 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 | « components/mus/ws/window_tree_unittest.cc ('k') | mash/app_driver/app_driver.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 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 MASH_APP_DRIVER_APP_DRIVER_H_ 5 #ifndef MASH_APP_DRIVER_APP_DRIVER_H_
6 #define MASH_APP_DRIVER_APP_DRIVER_H_ 6 #define MASH_APP_DRIVER_APP_DRIVER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 20 matching lines...) Expand all
31 const mojo::Array<catalog::mojom::EntryPtr>& entries); 31 const mojo::Array<catalog::mojom::EntryPtr>& entries);
32 32
33 // shell::ShellClient: 33 // shell::ShellClient:
34 void Initialize(shell::Connector* connector, 34 void Initialize(shell::Connector* connector,
35 const shell::Identity& identity, 35 const shell::Identity& identity,
36 uint32_t id) override; 36 uint32_t id) override;
37 bool AcceptConnection(shell::Connection* connection) override; 37 bool AcceptConnection(shell::Connection* connection) override;
38 bool ShellConnectionLost() override; 38 bool ShellConnectionLost() override;
39 39
40 // mus::mojom::AcceleratorHandler: 40 // mus::mojom::AcceleratorHandler:
41 void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override; 41 void OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) override;
42 42
43 void AddAccelerators(); 43 void AddAccelerators();
44 44
45 shell::Connector* connector_; 45 shell::Connector* connector_;
46 catalog::mojom::CatalogPtr catalog_; 46 catalog::mojom::CatalogPtr catalog_;
47 mojo::Binding<mus::mojom::AcceleratorHandler> binding_; 47 mojo::Binding<mus::mojom::AcceleratorHandler> binding_;
48 base::WeakPtrFactory<AppDriver> weak_factory_; 48 base::WeakPtrFactory<AppDriver> weak_factory_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(AppDriver); 50 DISALLOW_COPY_AND_ASSIGN(AppDriver);
51 }; 51 };
52 52
53 } // namespace app_driver 53 } // namespace app_driver
54 } // namespace mash 54 } // namespace mash
55 55
56 #endif // MASH_APP_DRIVER_APP_DRIVER_H_ 56 #endif // MASH_APP_DRIVER_APP_DRIVER_H_
OLDNEW
« no previous file with comments | « components/mus/ws/window_tree_unittest.cc ('k') | mash/app_driver/app_driver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698