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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/touch_hud/touch_hud_application.h
diff --git a/mash/webtest/webtest.h b/mash/touch_hud/touch_hud_application.h
similarity index 70%
copy from mash/webtest/webtest.h
copy to mash/touch_hud/touch_hud_application.h
index 4fffc0c99cfb569221fe566efcec4722cefe8f6d..6fa258838b0bd5da8e36973f121cf6cbf87e9511 100644
--- a/mash/webtest/webtest.h
+++ b/mash/touch_hud/touch_hud_application.h
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MASH_WEBTEST_WEBTEST_H_
-#define MASH_WEBTEST_WEBTEST_H_
+#ifndef MASH_TOUCH_HUD_TOUCH_HUD_APPLICATION_H_
+#define MASH_TOUCH_HUD_TOUCH_HUD_APPLICATION_H_
+#include <map>
#include <memory>
#include "base/macros.h"
@@ -20,18 +21,14 @@ class WindowManagerConnection;
}
namespace mash {
-namespace webtest {
+namespace touch_hud {
-class Webtest
- : public shell::ShellClient,
- public mojom::Launchable,
- public shell::InterfaceFactory<mojom::Launchable> {
+class TouchHudApplication : public shell::ShellClient,
+ public mojom::Launchable,
+ public shell::InterfaceFactory<mojom::Launchable> {
public:
- Webtest();
- ~Webtest() override;
-
- void AddWindow(views::Widget* window);
- void RemoveWindow(views::Widget* window);
+ TouchHudApplication();
+ ~TouchHudApplication() override;
private:
// shell::ShellClient:
@@ -49,16 +46,16 @@ class Webtest
shell::Connector* connector_ = nullptr;
mojo::BindingSet<mojom::Launchable> bindings_;
- std::vector<views::Widget*> windows_;
+ views::Widget* window_ = nullptr;
mojo::TracingImpl tracing_;
std::unique_ptr<views::AuraInit> aura_init_;
std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
- DISALLOW_COPY_AND_ASSIGN(Webtest);
+ DISALLOW_COPY_AND_ASSIGN(TouchHudApplication);
};
-} // namespace webtest
+} // namespace touch
} // namespace mash
-#endif // MASH_WEBTEST_WEBTEST_H_
+#endif // MASH_TOUCH_HUD_TOUCH_HUD_APPLICATION_H_
« 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