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

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

Issue 2215133002: Change signature of OnConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup
Patch Set: . Created 4 years, 4 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 | « ash/mus/window_manager_application.cc ('k') | ash/sysui/sysui_application.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 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_SYSUI_SYSUI_APPLICATION_H_ 5 #ifndef ASH_SYSUI_SYSUI_APPLICATION_H_
6 #define ASH_SYSUI_SYSUI_APPLICATION_H_ 6 #define ASH_SYSUI_SYSUI_APPLICATION_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/sysui/public/interfaces/wallpaper.mojom.h" 10 #include "ash/sysui/public/interfaces/wallpaper.mojom.h"
(...skipping 13 matching lines...) Expand all
24 : public shell::Service, 24 : public shell::Service,
25 public shell::InterfaceFactory<mash::shelf::mojom::ShelfController>, 25 public shell::InterfaceFactory<mash::shelf::mojom::ShelfController>,
26 public shell::InterfaceFactory<mojom::WallpaperController> { 26 public shell::InterfaceFactory<mojom::WallpaperController> {
27 public: 27 public:
28 SysUIApplication(); 28 SysUIApplication();
29 ~SysUIApplication() override; 29 ~SysUIApplication() override;
30 30
31 private: 31 private:
32 // shell::Service: 32 // shell::Service:
33 void OnStart(const ::shell::Identity& identity) override; 33 void OnStart(const ::shell::Identity& identity) override;
34 bool OnConnect(shell::Connection* connection) override; 34 bool OnConnect(const ::shell::Identity& remote_identity,
35 ::shell::InterfaceRegistry* registry) override;
35 36
36 // InterfaceFactory<mash::shelf::mojom::ShelfController>: 37 // InterfaceFactory<mash::shelf::mojom::ShelfController>:
37 void Create(const shell::Identity& remote_identity, 38 void Create(const shell::Identity& remote_identity,
38 mash::shelf::mojom::ShelfControllerRequest request) override; 39 mash::shelf::mojom::ShelfControllerRequest request) override;
39 40
40 // InterfaceFactory<mojom::WallpaperController>: 41 // InterfaceFactory<mojom::WallpaperController>:
41 void Create(const shell::Identity& remote_identity, 42 void Create(const shell::Identity& remote_identity,
42 mojom::WallpaperControllerRequest request) override; 43 mojom::WallpaperControllerRequest request) override;
43 44
44 tracing::Provider tracing_; 45 tracing::Provider tracing_;
45 std::unique_ptr<AshInit> ash_init_; 46 std::unique_ptr<AshInit> ash_init_;
46 47
47 mojo::BindingSet<mash::shelf::mojom::ShelfController> 48 mojo::BindingSet<mash::shelf::mojom::ShelfController>
48 shelf_controller_bindings_; 49 shelf_controller_bindings_;
49 mojo::BindingSet<mojom::WallpaperController> wallpaper_controller_bindings_; 50 mojo::BindingSet<mojom::WallpaperController> wallpaper_controller_bindings_;
50 51
51 // Subscribes to updates about input-devices. 52 // Subscribes to updates about input-devices.
52 ui::InputDeviceClient input_device_client_; 53 ui::InputDeviceClient input_device_client_;
53 54
54 DISALLOW_COPY_AND_ASSIGN(SysUIApplication); 55 DISALLOW_COPY_AND_ASSIGN(SysUIApplication);
55 }; 56 };
56 57
57 } // namespace sysui 58 } // namespace sysui
58 } // namespace ash 59 } // namespace ash
59 60
60 #endif // ASH_SYSUI_SYSUI_APPLICATION_H_ 61 #endif // ASH_SYSUI_SYSUI_APPLICATION_H_
OLDNEW
« no previous file with comments | « ash/mus/window_manager_application.cc ('k') | ash/sysui/sysui_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698