Index: ui/aura/mus/window_manager_delegate.h |
diff --git a/services/ui/public/cpp/window_manager_delegate.h b/ui/aura/mus/window_manager_delegate.h |
similarity index 84% |
copy from services/ui/public/cpp/window_manager_delegate.h |
copy to ui/aura/mus/window_manager_delegate.h |
index 2f724fc877fe9646be6ea52adc7f75ce30ea7b8d..c21382530895c45d3a85649b2c24e1fbaa25f83e 100644 |
--- a/services/ui/public/cpp/window_manager_delegate.h |
+++ b/ui/aura/mus/window_manager_delegate.h |
@@ -2,8 +2,8 @@ |
// 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_MANAGER_DELEGATE_H_ |
-#define SERVICES_UI_PUBLIC_CPP_WINDOW_MANAGER_DELEGATE_H_ |
+#ifndef UI_AURA_MUS_WINDOW_MANAGER_DELEGATE_H_ |
+#define UI_AURA_MUS_WINDOW_MANAGER_DELEGATE_H_ |
#include <stdint.h> |
@@ -17,6 +17,7 @@ |
#include "services/ui/public/interfaces/event_matcher.mojom.h" |
#include "services/ui/public/interfaces/window_manager_constants.mojom.h" |
#include "services/ui/public/interfaces/window_tree_constants.mojom.h" |
+#include "ui/aura/aura_export.h" |
#include "ui/events/mojo/event.mojom.h" |
namespace display { |
@@ -33,21 +34,21 @@ namespace ui { |
class Event; |
} |
-namespace ui { |
+namespace aura { |
class Window; |
// See the mojom with the same name for details on the functions in this |
// interface. |
-class WindowManagerClient { |
+class AURA_EXPORT WindowManagerClient { |
public: |
virtual void SetFrameDecorationValues( |
- mojom::FrameDecorationValuesPtr values) = 0; |
+ ui::mojom::FrameDecorationValuesPtr values) = 0; |
virtual void SetNonClientCursor(Window* window, |
- mojom::Cursor non_client_cursor) = 0; |
+ ui::mojom::Cursor non_client_cursor) = 0; |
virtual void AddAccelerator(uint32_t id, |
- mojom::EventMatcherPtr event_matcher, |
+ ui::mojom::EventMatcherPtr event_matcher, |
const base::Callback<void(bool)>& callback) = 0; |
virtual void RemoveAccelerator(uint32_t id) = 0; |
virtual void AddActivationParent(Window* window) = 0; |
@@ -65,7 +66,7 @@ class WindowManagerClient { |
// Used by clients implementing a window manager. |
// TODO(sky): this should be called WindowManager, but that's rather confusing |
// currently. |
-class WindowManagerDelegate { |
+class AURA_EXPORT WindowManagerDelegate { |
public: |
// Called once to give the delegate access to functions only exposed to |
// the WindowManager. |
@@ -80,7 +81,8 @@ class WindowManagerDelegate { |
// A client requested the shared property named |name| to change to |
// |new_data|. Return true to allow the change to |new_data|, false |
- // otherwise. |
+ // otherwise. If true is returned the property is set via |
+ // PropertyConverter::SetPropertyFromTransportValue(). |
virtual bool OnWmSetProperty( |
Window* window, |
const std::string& name, |
@@ -112,7 +114,8 @@ class WindowManagerDelegate { |
// Called when a display is modified. |
virtual void OnWmDisplayModified(const display::Display& display) = 0; |
- virtual mojom::EventResult OnAccelerator(uint32_t id, const ui::Event& event); |
+ virtual ui::mojom::EventResult OnAccelerator(uint32_t id, |
+ const ui::Event& event); |
virtual void OnWmPerformMoveLoop( |
Window* window, |
@@ -128,4 +131,4 @@ class WindowManagerDelegate { |
} // namespace ui |
-#endif // SERVICES_UI_PUBLIC_CPP_WINDOW_MANAGER_DELEGATE_H_ |
+#endif // UI_AURA_MUS_WINDOW_MANAGER_DELEGATE_H_ |