| Index: services/ui/ws/window_server.h
|
| diff --git a/components/mus/ws/window_server.h b/services/ui/ws/window_server.h
|
| similarity index 93%
|
| rename from components/mus/ws/window_server.h
|
| rename to services/ui/ws/window_server.h
|
| index 0ecbc76ee4cbf90554d5794dc7343d3c4b88b1b4..5da10604e84de377ef1ff9ba51b981bf08f9269c 100644
|
| --- a/components/mus/ws/window_server.h
|
| +++ b/services/ui/ws/window_server.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 COMPONENTS_MUS_WS_WINDOW_SERVER_H_
|
| -#define COMPONENTS_MUS_WS_WINDOW_SERVER_H_
|
| +#ifndef SERVICES_UI_WS_WINDOW_SERVER_H_
|
| +#define SERVICES_UI_WS_WINDOW_SERVER_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -13,21 +13,21 @@
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "components/mus/public/interfaces/window_manager_window_tree_factory.mojom.h"
|
| -#include "components/mus/public/interfaces/window_tree.mojom.h"
|
| -#include "components/mus/public/interfaces/window_tree_host.mojom.h"
|
| -#include "components/mus/surfaces/surfaces_state.h"
|
| -#include "components/mus/ws/display.h"
|
| -#include "components/mus/ws/display_manager_delegate.h"
|
| -#include "components/mus/ws/ids.h"
|
| -#include "components/mus/ws/operation.h"
|
| -#include "components/mus/ws/server_window_delegate.h"
|
| -#include "components/mus/ws/server_window_observer.h"
|
| -#include "components/mus/ws/user_id_tracker.h"
|
| -#include "components/mus/ws/user_id_tracker_observer.h"
|
| -#include "components/mus/ws/window_manager_window_tree_factory_set.h"
|
| #include "mojo/public/cpp/bindings/array.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| +#include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
|
| +#include "services/ui/public/interfaces/window_tree.mojom.h"
|
| +#include "services/ui/public/interfaces/window_tree_host.mojom.h"
|
| +#include "services/ui/surfaces/surfaces_state.h"
|
| +#include "services/ui/ws/display.h"
|
| +#include "services/ui/ws/display_manager_delegate.h"
|
| +#include "services/ui/ws/ids.h"
|
| +#include "services/ui/ws/operation.h"
|
| +#include "services/ui/ws/server_window_delegate.h"
|
| +#include "services/ui/ws/server_window_observer.h"
|
| +#include "services/ui/ws/user_id_tracker.h"
|
| +#include "services/ui/ws/user_id_tracker_observer.h"
|
| +#include "services/ui/ws/window_manager_window_tree_factory_set.h"
|
|
|
| namespace mus {
|
| namespace ws {
|
| @@ -339,4 +339,4 @@ class WindowServer : public ServerWindowDelegate,
|
| } // namespace ws
|
| } // namespace mus
|
|
|
| -#endif // COMPONENTS_MUS_WS_WINDOW_SERVER_H_
|
| +#endif // SERVICES_UI_WS_WINDOW_SERVER_H_
|
|
|