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

Unified Diff: services/ui/demo/mus_demo_external.h

Issue 2622103004: Mus Demo: Demonstrate external window mode (Closed)
Patch Set: Only disable the assert in external mode for now. Created 3 years, 10 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: services/ui/demo/mus_demo_external.h
diff --git a/services/ui/demo/mus_demo_external.h b/services/ui/demo/mus_demo_external.h
new file mode 100644
index 0000000000000000000000000000000000000000..4fecabe425e073928ed1a493f5efea637d918b65
--- /dev/null
+++ b/services/ui/demo/mus_demo_external.h
@@ -0,0 +1,38 @@
+// Copyright 2017 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 SERVICES_UI_DEMO_MUS_DEMO_EXTERNAL_H_
+#define SERVICES_UI_DEMO_MUS_DEMO_EXTERNAL_H_
+
+#include <memory>
+#include <vector>
+
+#include "services/ui/demo/mus_demo.h"
+#include "services/ui/public/interfaces/window_tree_host.mojom.h"
+
+namespace ui {
+namespace demo {
+
+class MusDemoExternal : public MusDemo {
+ public:
+ MusDemoExternal();
+ ~MusDemoExternal() final;
+
+ private:
+ void OnStartImpl(std::unique_ptr<aura::WindowTreeClient>& window_tree_client,
kylechar 2017/02/21 15:15:10 // MusDemo:
kylechar 2017/02/21 15:15:11 I didn't notice this wasn't const in a previous CL
fwang 2017/02/21 17:30:18 Done. I don't really like the OnStartImpl. Note af
+ std::unique_ptr<WindowTreeData>& window_tree_data) final;
+
+ // aura::WindowTreeClientDelegate:
+ void OnEmbed(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) final;
+ void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) final;
+
+ mojom::WindowTreeHostFactoryPtr window_tree_host_factory_;
+
+ DISALLOW_COPY_AND_ASSIGN(MusDemoExternal);
+};
+
+} // namespace demo
+} // namespace ui
+
+#endif // SERVICES_UI_DEMO_MUS_DEMO_EXTERNAL_H_

Powered by Google App Engine
This is Rietveld 408576698