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

Side by Side Diff: mash/webtest/webtest.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 | « 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"
(...skipping 18 matching lines...) Expand all
29 public: 29 public:
30 Webtest(); 30 Webtest();
31 ~Webtest() override; 31 ~Webtest() override;
32 32
33 void AddWindow(views::Widget* window); 33 void AddWindow(views::Widget* window);
34 void RemoveWindow(views::Widget* window); 34 void RemoveWindow(views::Widget* window);
35 35
36 private: 36 private:
37 // shell::Service: 37 // shell::Service:
38 void OnStart(const shell::Identity& identity) override; 38 void OnStart(const shell::Identity& identity) override;
39 bool OnConnect(shell::Connection* connection) override; 39 bool OnConnect(const shell::Identity& remote_identity,
40 shell::InterfaceRegistry* registry) override;
40 41
41 // mojom::Launchable: 42 // mojom::Launchable:
42 void Launch(uint32_t what, mojom::LaunchMode how) override; 43 void Launch(uint32_t what, mojom::LaunchMode how) override;
43 44
44 // shell::InterfaceFactory<mojom::Launchable>: 45 // shell::InterfaceFactory<mojom::Launchable>:
45 void Create(const shell::Identity& remote_identity, 46 void Create(const shell::Identity& remote_identity,
46 mojom::LaunchableRequest request) override; 47 mojom::LaunchableRequest request) override;
47 48
48 mojo::BindingSet<mojom::Launchable> bindings_; 49 mojo::BindingSet<mojom::Launchable> bindings_;
49 std::vector<views::Widget*> windows_; 50 std::vector<views::Widget*> windows_;
50 51
51 tracing::Provider tracing_; 52 tracing::Provider tracing_;
52 std::unique_ptr<views::AuraInit> aura_init_; 53 std::unique_ptr<views::AuraInit> aura_init_;
53 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 54 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
54 55
55 DISALLOW_COPY_AND_ASSIGN(Webtest); 56 DISALLOW_COPY_AND_ASSIGN(Webtest);
56 }; 57 };
57 58
58 } // namespace webtest 59 } // namespace webtest
59 } // namespace mash 60 } // namespace mash
60 61
61 #endif // MASH_WEBTEST_WEBTEST_H_ 62 #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