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

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

Issue 2500683002: Revert of Service Manager: Remove ServiceContext* arg from Service::OnStart() (Closed)
Patch Set: Created 4 years, 1 month 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 | « mash/login/login.cc ('k') | mash/quick_launch/quick_launch.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 MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ 5 #ifndef MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_
6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ 6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "mash/public/interfaces/launchable.mojom.h" 11 #include "mash/public/interfaces/launchable.mojom.h"
12 #include "mojo/public/cpp/bindings/binding_set.h" 12 #include "mojo/public/cpp/bindings/binding_set.h"
13 #include "services/service_manager/public/cpp/interface_factory.h" 13 #include "services/service_manager/public/cpp/interface_factory.h"
14 #include "services/service_manager/public/cpp/service.h" 14 #include "services/service_manager/public/cpp/service.h"
15 #include "services/tracing/public/cpp/provider.h" 15 #include "services/tracing/public/cpp/provider.h"
16 16
17 namespace service_manager {
18 class ServiceContext;
19 }
20
17 namespace views { 21 namespace views {
18 class AuraInit; 22 class AuraInit;
19 class Widget; 23 class Widget;
20 class WindowManagerConnection; 24 class WindowManagerConnection;
21 } 25 }
22 26
23 namespace mash { 27 namespace mash {
24 namespace quick_launch { 28 namespace quick_launch {
25 29
26 class QuickLaunch 30 class QuickLaunch
27 : public service_manager::Service, 31 : public service_manager::Service,
28 public mojom::Launchable, 32 public mojom::Launchable,
29 public service_manager::InterfaceFactory<mojom::Launchable> { 33 public service_manager::InterfaceFactory<mojom::Launchable> {
30 public: 34 public:
31 QuickLaunch(); 35 QuickLaunch();
32 ~QuickLaunch() override; 36 ~QuickLaunch() override;
33 37
34 void RemoveWindow(views::Widget* window); 38 void RemoveWindow(views::Widget* window);
35 39
36 private: 40 private:
37 // service_manager::Service: 41 // service_manager::Service:
38 void OnStart() override; 42 void OnStart(service_manager::ServiceContext* context) override;
39 bool OnConnect(const service_manager::ServiceInfo& remote_info, 43 bool OnConnect(const service_manager::ServiceInfo& remote_info,
40 service_manager::InterfaceRegistry* registry) override; 44 service_manager::InterfaceRegistry* registry) override;
41 45
42 // mojom::Launchable: 46 // mojom::Launchable:
43 void Launch(uint32_t what, mojom::LaunchMode how) override; 47 void Launch(uint32_t what, mojom::LaunchMode how) override;
44 48
45 // service_manager::InterfaceFactory<mojom::Launchable>: 49 // service_manager::InterfaceFactory<mojom::Launchable>:
46 void Create(const service_manager::Identity& remote_identity, 50 void Create(const service_manager::Identity& remote_identity,
47 mojom::LaunchableRequest request) override; 51 mojom::LaunchableRequest request) override;
48 52
53 service_manager::ServiceContext* context_ = nullptr;
54
49 mojo::BindingSet<mojom::Launchable> bindings_; 55 mojo::BindingSet<mojom::Launchable> bindings_;
50 std::vector<views::Widget*> windows_; 56 std::vector<views::Widget*> windows_;
51 57
52 tracing::Provider tracing_; 58 tracing::Provider tracing_;
53 std::unique_ptr<views::AuraInit> aura_init_; 59 std::unique_ptr<views::AuraInit> aura_init_;
54 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 60 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
55 61
56 DISALLOW_COPY_AND_ASSIGN(QuickLaunch); 62 DISALLOW_COPY_AND_ASSIGN(QuickLaunch);
57 }; 63 };
58 64
59 } // namespace quick_launch 65 } // namespace quick_launch
60 } // namespace mash 66 } // namespace mash
61 67
62 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ 68 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_
OLDNEW
« no previous file with comments | « mash/login/login.cc ('k') | mash/quick_launch/quick_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698