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

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

Issue 2646193002: Replace OnConnect with OnBindInterface in //mash. (Closed)
Patch Set: . Created 3 years, 11 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 | « mash/task_viewer/task_viewer.cc ('k') | mash/webtest/webtest.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_WEBTEST_WEBTEST_H_ 5 #ifndef MASH_WEBTEST_WEBTEST_H_
6 #define MASH_WEBTEST_WEBTEST_H_ 6 #define MASH_WEBTEST_WEBTEST_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/binder_registry.h"
13 #include "services/service_manager/public/cpp/interface_factory.h" 14 #include "services/service_manager/public/cpp/interface_factory.h"
14 #include "services/service_manager/public/cpp/service.h" 15 #include "services/service_manager/public/cpp/service.h"
15 #include "services/tracing/public/cpp/provider.h" 16 #include "services/tracing/public/cpp/provider.h"
16 17
17 namespace views { 18 namespace views {
18 class AuraInit; 19 class AuraInit;
19 class Widget; 20 class Widget;
20 } 21 }
21 22
22 namespace mash { 23 namespace mash {
23 namespace webtest { 24 namespace webtest {
24 25
25 class Webtest : public service_manager::Service, 26 class Webtest : public service_manager::Service,
26 public mojom::Launchable, 27 public mojom::Launchable,
27 public service_manager::InterfaceFactory<mojom::Launchable> { 28 public service_manager::InterfaceFactory<mojom::Launchable> {
28 public: 29 public:
29 Webtest(); 30 Webtest();
30 ~Webtest() override; 31 ~Webtest() override;
31 32
32 void AddWindow(views::Widget* window); 33 void AddWindow(views::Widget* window);
33 void RemoveWindow(views::Widget* window); 34 void RemoveWindow(views::Widget* window);
34 35
35 private: 36 private:
36 // service_manager::Service: 37 // service_manager::Service:
37 void OnStart() override; 38 void OnStart() override;
38 bool OnConnect(const service_manager::ServiceInfo& remote_info, 39 void OnBindInterface(const service_manager::ServiceInfo& source_info,
39 service_manager::InterfaceRegistry* registry) override; 40 const std::string& interface_name,
41 mojo::ScopedMessagePipeHandle interface_pipe) override;
40 42
41 // mojom::Launchable: 43 // mojom::Launchable:
42 void Launch(uint32_t what, mojom::LaunchMode how) override; 44 void Launch(uint32_t what, mojom::LaunchMode how) override;
43 45
44 // service_manager::InterfaceFactory<mojom::Launchable>: 46 // service_manager::InterfaceFactory<mojom::Launchable>:
45 void Create(const service_manager::Identity& remote_identity, 47 void Create(const service_manager::Identity& remote_identity,
46 mojom::LaunchableRequest request) override; 48 mojom::LaunchableRequest request) override;
47 49
48 mojo::BindingSet<mojom::Launchable> bindings_; 50 mojo::BindingSet<mojom::Launchable> bindings_;
49 std::vector<views::Widget*> windows_; 51 std::vector<views::Widget*> windows_;
50 52
53 service_manager::BinderRegistry registry_;
54
51 tracing::Provider tracing_; 55 tracing::Provider tracing_;
52 std::unique_ptr<views::AuraInit> aura_init_; 56 std::unique_ptr<views::AuraInit> aura_init_;
53 57
54 DISALLOW_COPY_AND_ASSIGN(Webtest); 58 DISALLOW_COPY_AND_ASSIGN(Webtest);
55 }; 59 };
56 60
57 } // namespace webtest 61 } // namespace webtest
58 } // namespace mash 62 } // namespace mash
59 63
60 #endif // MASH_WEBTEST_WEBTEST_H_ 64 #endif // MASH_WEBTEST_WEBTEST_H_
OLDNEW
« no previous file with comments | « mash/task_viewer/task_viewer.cc ('k') | mash/webtest/webtest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698