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

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

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

Powered by Google App Engine
This is Rietveld 408576698