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

Side by Side Diff: ash/mus/sysui_application.h

Issue 1992443002: Add Mojo IPC based input-device service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_ddm
Patch Set: Clean up/move files. Created 4 years, 7 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 ASH_MUS_SYSUI_APPLICATION_H_ 5 #ifndef ASH_MUS_SYSUI_APPLICATION_H_
6 #define ASH_MUS_SYSUI_APPLICATION_H_ 6 #define ASH_MUS_SYSUI_APPLICATION_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "components/input_device_service/input_device_client.h"
11 #include "mash/shelf/public/interfaces/shelf.mojom.h" 12 #include "mash/shelf/public/interfaces/shelf.mojom.h"
12 #include "mojo/public/cpp/bindings/binding_set.h" 13 #include "mojo/public/cpp/bindings/binding_set.h"
13 #include "services/shell/public/cpp/shell_client.h" 14 #include "services/shell/public/cpp/shell_client.h"
14 #include "services/tracing/public/cpp/tracing_impl.h" 15 #include "services/tracing/public/cpp/tracing_impl.h"
15 16
16 namespace ash { 17 namespace ash {
17 namespace sysui { 18 namespace sysui {
18 19
19 class AshInit; 20 class AshInit;
20 21
(...skipping 15 matching lines...) Expand all
36 void Create(shell::Connection* connection, 37 void Create(shell::Connection* connection,
37 mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> 38 mojo::InterfaceRequest<mash::shelf::mojom::ShelfController>
38 request) override; 39 request) override;
39 40
40 mojo::TracingImpl tracing_; 41 mojo::TracingImpl tracing_;
41 std::unique_ptr<AshInit> ash_init_; 42 std::unique_ptr<AshInit> ash_init_;
42 43
43 mojo::BindingSet<mash::shelf::mojom::ShelfController> 44 mojo::BindingSet<mash::shelf::mojom::ShelfController>
44 shelf_controller_bindings_; 45 shelf_controller_bindings_;
45 46
47 input_device::InputDeviceClient input_device_client_;
48
46 DISALLOW_COPY_AND_ASSIGN(SysUIApplication); 49 DISALLOW_COPY_AND_ASSIGN(SysUIApplication);
47 }; 50 };
48 51
49 } // namespace sysui 52 } // namespace sysui
50 } // namespace ash 53 } // namespace ash
51 54
52 #endif // ASH_MUS_SYSUI_APPLICATION_H_ 55 #endif // ASH_MUS_SYSUI_APPLICATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698