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

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

Issue 2026623002: views/mus: Have explicit ownership of views::WindowManagerConnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 4 years, 6 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/shell/public/cpp/shell_client.h" 13 #include "services/shell/public/cpp/shell_client.h"
14 #include "services/tracing/public/cpp/tracing_impl.h" 14 #include "services/tracing/public/cpp/tracing_impl.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 } 20 }
20 21
21 namespace mash { 22 namespace mash {
22 namespace webtest { 23 namespace webtest {
23 24
24 class Webtest 25 class Webtest
25 : public shell::ShellClient, 26 : public shell::ShellClient,
26 public mojom::Launchable, 27 public mojom::Launchable,
27 public shell::InterfaceFactory<mojom::Launchable> { 28 public shell::InterfaceFactory<mojom::Launchable> {
28 public: 29 public:
(...skipping 16 matching lines...) Expand all
45 // shell::InterfaceFactory<mojom::Launchable>: 46 // shell::InterfaceFactory<mojom::Launchable>:
46 void Create(shell::Connection* connection, 47 void Create(shell::Connection* connection,
47 mojom::LaunchableRequest request) override; 48 mojom::LaunchableRequest request) override;
48 49
49 shell::Connector* connector_ = nullptr; 50 shell::Connector* connector_ = nullptr;
50 mojo::BindingSet<mojom::Launchable> bindings_; 51 mojo::BindingSet<mojom::Launchable> bindings_;
51 std::vector<views::Widget*> windows_; 52 std::vector<views::Widget*> windows_;
52 53
53 mojo::TracingImpl tracing_; 54 mojo::TracingImpl tracing_;
54 std::unique_ptr<views::AuraInit> aura_init_; 55 std::unique_ptr<views::AuraInit> aura_init_;
56 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
55 57
56 DISALLOW_COPY_AND_ASSIGN(Webtest); 58 DISALLOW_COPY_AND_ASSIGN(Webtest);
57 }; 59 };
58 60
59 } // namespace webtest 61 } // namespace webtest
60 } // namespace mash 62 } // namespace mash
61 63
62 #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