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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
Index: mash/touch/touch_hud_application.h
diff --git a/mash/catalog_viewer/catalog_viewer.h b/mash/touch/touch_hud_application.h
similarity index 70%
copy from mash/catalog_viewer/catalog_viewer.h
copy to mash/touch/touch_hud_application.h
index 9f393f096d782db4962ee48e8c570820d3835c0b..80e005bb2fd23e231fda47ab2721193e4e5f04f6 100644
--- a/mash/catalog_viewer/catalog_viewer.h
+++ b/mash/touch/touch_hud_application.h
@@ -2,13 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_
-#define MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_
+#ifndef MASH_TOUCH_TOUCH_HUD_APPLICATION_H_
+#define MASH_TOUCH_TOUCH_HUD_APPLICATION_H_
#include <map>
#include <memory>
-#include "base/callback.h"
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
@@ -22,16 +21,16 @@ class WindowManagerConnection;
}
namespace mash {
-namespace catalog_viewer {
+namespace touch {
-class CatalogViewer : 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:
- CatalogViewer();
- ~CatalogViewer() override;
+ TouchHudApplication();
+ ~TouchHudApplication() override;
- void RemoveWindow(views::Widget* window);
+ void RemoveWindow(views::Widget* widget);
private:
// shell::ShellClient:
@@ -47,7 +46,6 @@ class CatalogViewer : public shell::ShellClient,
void Create(shell::Connection* connection,
mojom::LaunchableRequest request) override;
-
shell::Connector* connector_ = nullptr;
mojo::BindingSet<mojom::Launchable> bindings_;
std::vector<views::Widget*> windows_;
@@ -56,10 +54,12 @@ class CatalogViewer : public shell::ShellClient,
std::unique_ptr<views::AuraInit> aura_init_;
std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
- DISALLOW_COPY_AND_ASSIGN(CatalogViewer);
+ 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.
+
+ DISALLOW_COPY_AND_ASSIGN(TouchHudApplication);
};
-} // namespace catalog_viewer
+} // namespace touch
} // namespace mash
-#endif // MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_
+#endif // MASH_TOUCH_TOUCH_HUD_APPLICATION_H_

Powered by Google App Engine
This is Rietveld 408576698