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

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

Issue 2092343002: Touch HUD app for mustash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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_CATALOG_VIEWER_CATALOG_VIEWER_H_ 5 #ifndef MASH_TOUCH_TOUCH_HUD_APPLICATION_H_
6 #define MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_ 6 #define MASH_TOUCH_TOUCH_HUD_APPLICATION_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
11 #include "base/callback.h"
12 #include "base/macros.h" 11 #include "base/macros.h"
13 #include "mash/public/interfaces/launchable.mojom.h" 12 #include "mash/public/interfaces/launchable.mojom.h"
14 #include "mojo/public/cpp/bindings/binding_set.h" 13 #include "mojo/public/cpp/bindings/binding_set.h"
15 #include "services/shell/public/cpp/shell_client.h" 14 #include "services/shell/public/cpp/shell_client.h"
16 #include "services/tracing/public/cpp/tracing_impl.h" 15 #include "services/tracing/public/cpp/tracing_impl.h"
17 16
18 namespace views { 17 namespace views {
19 class AuraInit; 18 class AuraInit;
20 class Widget; 19 class Widget;
21 class WindowManagerConnection; 20 class WindowManagerConnection;
22 } 21 }
23 22
24 namespace mash { 23 namespace mash {
25 namespace catalog_viewer { 24 namespace touch {
26 25
27 class CatalogViewer : public shell::ShellClient, 26 class TouchHudApplication : public shell::ShellClient,
28 public mojom::Launchable, 27 public mojom::Launchable,
29 public shell::InterfaceFactory<mojom::Launchable> { 28 public shell::InterfaceFactory<mojom::Launchable> {
30 public: 29 public:
31 CatalogViewer(); 30 TouchHudApplication();
32 ~CatalogViewer() override; 31 ~TouchHudApplication() override;
33 32
34 void RemoveWindow(views::Widget* window); 33 void RemoveWindow(views::Widget* widget);
35 34
36 private: 35 private:
37 // shell::ShellClient: 36 // shell::ShellClient:
38 void Initialize(shell::Connector* connector, 37 void Initialize(shell::Connector* connector,
39 const shell::Identity& identity, 38 const shell::Identity& identity,
40 uint32_t id) override; 39 uint32_t id) override;
41 bool AcceptConnection(shell::Connection* connection) override; 40 bool AcceptConnection(shell::Connection* connection) override;
42 41
43 // mojom::Launchable: 42 // mojom::Launchable:
44 void Launch(uint32_t what, mojom::LaunchMode how) override; 43 void Launch(uint32_t what, mojom::LaunchMode how) override;
45 44
46 // shell::InterfaceFactory<mojom::Launchable>: 45 // shell::InterfaceFactory<mojom::Launchable>:
47 void Create(shell::Connection* connection, 46 void Create(shell::Connection* connection,
48 mojom::LaunchableRequest request) override; 47 mojom::LaunchableRequest request) override;
49 48
50
51 shell::Connector* connector_ = nullptr; 49 shell::Connector* connector_ = nullptr;
52 mojo::BindingSet<mojom::Launchable> bindings_; 50 mojo::BindingSet<mojom::Launchable> bindings_;
53 std::vector<views::Widget*> windows_; 51 std::vector<views::Widget*> windows_;
54 52
55 mojo::TracingImpl tracing_; 53 mojo::TracingImpl tracing_;
56 std::unique_ptr<views::AuraInit> aura_init_; 54 std::unique_ptr<views::AuraInit> aura_init_;
57 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 55 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
58 56
59 DISALLOW_COPY_AND_ASSIGN(CatalogViewer); 57 bool touch_hud_enabled = false;
sadrul 2016/06/27 14:44:54 member variables should end with an underscore
riajiang 2016/06/28 21:52:51 Done.
58
59 DISALLOW_COPY_AND_ASSIGN(TouchHudApplication);
60 }; 60 };
61 61
62 } // namespace catalog_viewer 62 } // namespace touch
63 } // namespace mash 63 } // namespace mash
64 64
65 #endif // MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_ 65 #endif // MASH_TOUCH_TOUCH_HUD_APPLICATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698