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

Side by Side Diff: mash/touch_hud/touch_hud_application.h

Issue 2092343002: Touch HUD app for mustash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change window manager connection unittest to original Created 4 years, 5 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/touch_hud/manifest.json ('k') | mash/touch_hud/touch_hud_application.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_TOUCH_HUD_TOUCH_HUD_APPLICATION_H_
6 #define MASH_WEBTEST_WEBTEST_H_ 6 #define MASH_TOUCH_HUD_TOUCH_HUD_APPLICATION_H_
7 7
8 #include <map>
8 #include <memory> 9 #include <memory>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "mash/public/interfaces/launchable.mojom.h" 12 #include "mash/public/interfaces/launchable.mojom.h"
12 #include "mojo/public/cpp/bindings/binding_set.h" 13 #include "mojo/public/cpp/bindings/binding_set.h"
13 #include "services/shell/public/cpp/shell_client.h" 14 #include "services/shell/public/cpp/shell_client.h"
14 #include "services/tracing/public/cpp/tracing_impl.h" 15 #include "services/tracing/public/cpp/tracing_impl.h"
15 16
16 namespace views { 17 namespace views {
17 class AuraInit; 18 class AuraInit;
18 class Widget; 19 class Widget;
19 class WindowManagerConnection; 20 class WindowManagerConnection;
20 } 21 }
21 22
22 namespace mash { 23 namespace mash {
23 namespace webtest { 24 namespace touch_hud {
24 25
25 class Webtest 26 class TouchHudApplication : public shell::ShellClient,
26 : public shell::ShellClient, 27 public mojom::Launchable,
27 public mojom::Launchable, 28 public shell::InterfaceFactory<mojom::Launchable> {
28 public shell::InterfaceFactory<mojom::Launchable> {
29 public: 29 public:
30 Webtest(); 30 TouchHudApplication();
31 ~Webtest() override; 31 ~TouchHudApplication() override;
32
33 void AddWindow(views::Widget* window);
34 void RemoveWindow(views::Widget* window);
35 32
36 private: 33 private:
37 // shell::ShellClient: 34 // shell::ShellClient:
38 void Initialize(shell::Connector* connector, 35 void Initialize(shell::Connector* connector,
39 const shell::Identity& identity, 36 const shell::Identity& identity,
40 uint32_t id) override; 37 uint32_t id) override;
41 bool AcceptConnection(shell::Connection* connection) override; 38 bool AcceptConnection(shell::Connection* connection) override;
42 39
43 // mojom::Launchable: 40 // mojom::Launchable:
44 void Launch(uint32_t what, mojom::LaunchMode how) override; 41 void Launch(uint32_t what, mojom::LaunchMode how) override;
45 42
46 // shell::InterfaceFactory<mojom::Launchable>: 43 // shell::InterfaceFactory<mojom::Launchable>:
47 void Create(shell::Connection* connection, 44 void Create(shell::Connection* connection,
48 mojom::LaunchableRequest request) override; 45 mojom::LaunchableRequest request) override;
49 46
50 shell::Connector* connector_ = nullptr; 47 shell::Connector* connector_ = nullptr;
51 mojo::BindingSet<mojom::Launchable> bindings_; 48 mojo::BindingSet<mojom::Launchable> bindings_;
52 std::vector<views::Widget*> windows_; 49 views::Widget* window_ = nullptr;
53 50
54 mojo::TracingImpl tracing_; 51 mojo::TracingImpl tracing_;
55 std::unique_ptr<views::AuraInit> aura_init_; 52 std::unique_ptr<views::AuraInit> aura_init_;
56 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 53 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
57 54
58 DISALLOW_COPY_AND_ASSIGN(Webtest); 55 DISALLOW_COPY_AND_ASSIGN(TouchHudApplication);
59 }; 56 };
60 57
61 } // namespace webtest 58 } // namespace touch
62 } // namespace mash 59 } // namespace mash
63 60
64 #endif // MASH_WEBTEST_WEBTEST_H_ 61 #endif // MASH_TOUCH_HUD_TOUCH_HUD_APPLICATION_H_
OLDNEW
« no previous file with comments | « mash/touch_hud/manifest.json ('k') | mash/touch_hud/touch_hud_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698