Index: ash/touch_hud/mus/touch_hud_application.h |
diff --git a/mash/example/window_type_launcher/window_type_launcher.h b/ash/touch_hud/mus/touch_hud_application.h |
similarity index 60% |
copy from mash/example/window_type_launcher/window_type_launcher.h |
copy to ash/touch_hud/mus/touch_hud_application.h |
index 2154e3e337e079cdfb7d3dce1baab68c04635b04..af806bb7cd2a61e9915f5789b91c085035766ce9 100644 |
--- a/mash/example/window_type_launcher/window_type_launcher.h |
+++ b/ash/touch_hud/mus/touch_hud_application.h |
@@ -1,15 +1,15 @@ |
-// 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_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_ |
-#define MASH_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_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" |
-#include "mojo/public/cpp/bindings/binding_set.h" |
+#include "mojo/public/cpp/bindings/binding.h" |
#include "services/shell/public/cpp/service.h" |
namespace views { |
@@ -18,15 +18,16 @@ class Widget; |
class WindowManagerConnection; |
} |
-class WindowTypeLauncher |
+namespace ash { |
+namespace touch_hud { |
+ |
+class TouchHudApplication |
: public shell::Service, |
public mash::mojom::Launchable, |
public shell::InterfaceFactory<mash::mojom::Launchable> { |
public: |
- WindowTypeLauncher(); |
- ~WindowTypeLauncher() override; |
- |
- void RemoveWindow(views::Widget* window); |
+ TouchHudApplication(); |
+ ~TouchHudApplication() override; |
private: |
// shell::Service: |
@@ -35,21 +36,24 @@ class WindowTypeLauncher |
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_; |
- std::vector<views::Widget*> windows_; |
+ mojo::Binding<mash::mojom::Launchable> binding_; |
+ views::Widget* widget_ = nullptr; |
std::unique_ptr<views::AuraInit> aura_init_; |
std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |
- DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher); |
+ DISALLOW_COPY_AND_ASSIGN(TouchHudApplication); |
}; |
-#endif // MASH_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_ |
+} // namespace touch_hud |
+} // namespace ash |
+ |
+#endif // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ |