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

Unified Diff: ui/aura/mus/window_tree_client_delegate.h

Issue 2445163002: Make aura work with mus (Closed)
Patch Set: NON_EXPORTED_BASE_CLASS Created 4 years, 2 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 | « ui/aura/mus/window_tree_client.cc ('k') | ui/aura/mus/window_tree_client_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/window_tree_client_delegate.h
diff --git a/services/ui/public/cpp/window_tree_client_delegate.h b/ui/aura/mus/window_tree_client_delegate.h
similarity index 70%
copy from services/ui/public/cpp/window_tree_client_delegate.h
copy to ui/aura/mus/window_tree_client_delegate.h
index 3664ac282dcf6ba728163671e8c6d528f859e7f5..9c3a16288c646da7f8cd45337133ec5a06eacf75 100644
--- a/services/ui/public/cpp/window_tree_client_delegate.h
+++ b/ui/aura/mus/window_tree_client_delegate.h
@@ -2,25 +2,34 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_DELEGATE_H_
-#define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_DELEGATE_H_
+#ifndef UI_AURA_MUS_WINDOW_TREE_CLIENT_DELEGATE_H_
+#define UI_AURA_MUS_WINDOW_TREE_CLIENT_DELEGATE_H_
+#include <memory>
#include <string>
#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
+#include "ui/aura/aura_export.h"
namespace ui {
class Event;
}
-namespace ui {
+namespace aura {
+class PropertyConverter;
class Window;
+class WindowPortMus;
class WindowTreeClient;
+namespace client {
+class CaptureClient;
+class FocusClient;
+}
+
// Interface implemented by an application using mus.
-class WindowTreeClientDelegate {
+class AURA_EXPORT WindowTreeClientDelegate {
public:
// Called when the application implementing this interface is embedded at
// |root|.
@@ -52,10 +61,20 @@ class WindowTreeClientDelegate {
virtual void OnPointerEventObserved(const ui::PointerEvent& event,
Window* target) = 0;
+ // Mus expects a single FocusClient is used for all WindowTreeHosts. This
+ // returns it. GetFocusClient() is called from the constructor.
+ virtual client::FocusClient* GetFocusClient() = 0;
+
+ // Mus expects a single CaptureClient is used for all WindowTreeHosts. This
+ // returns it. GetCaptureClient() is called from the constructor.
+ virtual client::CaptureClient* GetCaptureClient() = 0;
+
+ virtual PropertyConverter* GetPropertyConverter() = 0;
+
protected:
virtual ~WindowTreeClientDelegate() {}
};
-} // namespace ui
+} // namespace aura
-#endif // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_DELEGATE_H_
+#endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_DELEGATE_H_
« no previous file with comments | « ui/aura/mus/window_tree_client.cc ('k') | ui/aura/mus/window_tree_client_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698