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

Unified Diff: ash/touch_hud/mus/touch_hud_application.h

Issue 2150933003: mash: Add touch-hud app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sequence. 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
Index: ash/touch_hud/mus/touch_hud_application.h
diff --git a/mash/example/views_examples/views_examples_application_delegate.h b/ash/touch_hud/mus/touch_hud_application.h
similarity index 65%
copy from mash/example/views_examples/views_examples_application_delegate.h
copy to ash/touch_hud/mus/touch_hud_application.h
index 40453f27ffc269ac680ad9b0c60a5eeae2b8fef2..61d104fba00989701cea7b5e699a66bbb16ac959 100644
--- a/mash/example/views_examples/views_examples_application_delegate.h
+++ b/ash/touch_hud/mus/touch_hud_application.h
@@ -1,11 +1,11 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_
-#define MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_
+#ifndef ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_
+#define ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_
-#include <memory>
+#include <map>
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
@@ -15,16 +15,20 @@
namespace views {
class AuraInit;
+class Widget;
class WindowManagerConnection;
}
-class ViewsExamplesApplicationDelegate
+namespace ash {
+namespace touch_hud {
+
+class TouchHudApplication
: public shell::Service,
public mash::mojom::Launchable,
public shell::InterfaceFactory<mash::mojom::Launchable> {
public:
- ViewsExamplesApplicationDelegate();
- ~ViewsExamplesApplicationDelegate() override;
+ TouchHudApplication();
+ ~TouchHudApplication() override;
private:
// shell::Service:
@@ -33,20 +37,25 @@ class ViewsExamplesApplicationDelegate
uint32_t id) override;
bool OnConnect(shell::Connection* connection) override;
- // mash::mojom::Launchable:
+ // mojom::Launchable:
void Launch(uint32_t what, mash::mojom::LaunchMode how) override;
- // shell::InterfaceFactory<mash::mojom::Launchable>:
+ // shell::InterfaceFactory<mojom::Launchable>:
void Create(shell::Connection* connection,
mash::mojom::LaunchableRequest request) override;
+ shell::Connector* connector_ = nullptr;
mojo::BindingSet<mash::mojom::Launchable> bindings_;
sadrul 2016/07/15 15:01:11 I don't think we need a BindingSet. Use a Binding
riajiang 2016/07/15 17:01:27 Done.
+ views::Widget* widget_ = nullptr;
mojo::TracingImpl tracing_;
sadrul 2016/07/15 15:01:11 Let's start without the tracing for now.
riajiang 2016/07/15 17:01:27 Done.
std::unique_ptr<views::AuraInit> aura_init_;
std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
- DISALLOW_COPY_AND_ASSIGN(ViewsExamplesApplicationDelegate);
+ DISALLOW_COPY_AND_ASSIGN(TouchHudApplication);
};
-#endif // MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_
+} // namespace touch_hud
+} // namespace ash
+
+#endif // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_

Powered by Google App Engine
This is Rietveld 408576698