diff options
-rw-r--r-- | components/html_viewer/BUILD.gn | 2 | ||||
-rw-r--r-- | components/html_viewer/html_document.cc | 2 | ||||
-rw-r--r-- | components/html_viewer/html_frame.cc | 2 | ||||
-rw-r--r-- | components/mus/BUILD.gn | 2 | ||||
-rw-r--r-- | components/mus/gles2/BUILD.gn | 2 | ||||
-rw-r--r-- | components/mus/mus_app.cc | 10 | ||||
-rw-r--r-- | components/mus/mus_app.h | 2 | ||||
-rw-r--r-- | components/mus/ws/BUILD.gn (renamed from components/mus/vm/BUILD.gn) | 0 | ||||
-rw-r--r-- | components/mus/ws/access_policy.h (renamed from components/mus/vm/access_policy.h) | 8 | ||||
-rw-r--r-- | components/mus/ws/access_policy_delegate.h (renamed from components/mus/vm/access_policy_delegate.h) | 8 | ||||
-rw-r--r-- | components/mus/ws/client_connection.cc (renamed from components/mus/vm/client_connection.cc) | 6 | ||||
-rw-r--r-- | components/mus/ws/client_connection.h (renamed from components/mus/vm/client_connection.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/connection_manager.cc (renamed from components/mus/vm/connection_manager.cc) | 14 | ||||
-rw-r--r-- | components/mus/ws/connection_manager.h (renamed from components/mus/vm/connection_manager.h) | 16 | ||||
-rw-r--r-- | components/mus/ws/connection_manager_delegate.h (renamed from components/mus/vm/connection_manager_delegate.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/default_access_policy.cc (renamed from components/mus/vm/default_access_policy.cc) | 6 | ||||
-rw-r--r-- | components/mus/ws/default_access_policy.h (renamed from components/mus/vm/default_access_policy.h) | 8 | ||||
-rw-r--r-- | components/mus/ws/display_manager.cc (renamed from components/mus/vm/display_manager.cc) | 8 | ||||
-rw-r--r-- | components/mus/ws/display_manager.h (renamed from components/mus/vm/display_manager.h) | 8 | ||||
-rw-r--r-- | components/mus/ws/display_manager_delegate.h (renamed from components/mus/vm/display_manager_delegate.h) | 8 | ||||
-rw-r--r-- | components/mus/ws/display_manager_factory.h (renamed from components/mus/vm/display_manager_factory.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/event_dispatcher.cc (renamed from components/mus/vm/event_dispatcher.cc) | 12 | ||||
-rw-r--r-- | components/mus/ws/event_dispatcher.h (renamed from components/mus/vm/event_dispatcher.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/focus_controller.cc (renamed from components/mus/vm/focus_controller.cc) | 8 | ||||
-rw-r--r-- | components/mus/ws/focus_controller.h (renamed from components/mus/vm/focus_controller.h) | 8 | ||||
-rw-r--r-- | components/mus/ws/focus_controller_delegate.h (renamed from components/mus/vm/focus_controller_delegate.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/focus_controller_unittest.cc (renamed from components/mus/vm/focus_controller_unittest.cc) | 8 | ||||
-rw-r--r-- | components/mus/ws/ids.h (renamed from components/mus/vm/ids.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/server_view.cc (renamed from components/mus/vm/server_view.cc) | 6 | ||||
-rw-r--r-- | components/mus/ws/server_view.h (renamed from components/mus/vm/server_view.h) | 10 | ||||
-rw-r--r-- | components/mus/ws/server_view_delegate.h (renamed from components/mus/vm/server_view_delegate.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/server_view_drawn_tracker.cc (renamed from components/mus/vm/server_view_drawn_tracker.cc) | 6 | ||||
-rw-r--r-- | components/mus/ws/server_view_drawn_tracker.h (renamed from components/mus/vm/server_view_drawn_tracker.h) | 8 | ||||
-rw-r--r-- | components/mus/ws/server_view_drawn_tracker_observer.h (renamed from components/mus/vm/server_view_drawn_tracker_observer.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/server_view_drawn_tracker_unittest.cc (renamed from components/mus/vm/server_view_drawn_tracker_unittest.cc) | 8 | ||||
-rw-r--r-- | components/mus/ws/server_view_observer.h (renamed from components/mus/vm/server_view_observer.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/server_view_surface.cc (renamed from components/mus/vm/server_view_surface.cc) | 6 | ||||
-rw-r--r-- | components/mus/ws/server_view_surface.h (renamed from components/mus/vm/server_view_surface.h) | 8 | ||||
-rw-r--r-- | components/mus/ws/test_change_tracker.cc (renamed from components/mus/vm/test_change_tracker.cc) | 2 | ||||
-rw-r--r-- | components/mus/ws/test_change_tracker.h (renamed from components/mus/vm/test_change_tracker.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/test_server_view_delegate.cc (renamed from components/mus/vm/test_server_view_delegate.cc) | 4 | ||||
-rw-r--r-- | components/mus/ws/test_server_view_delegate.h (renamed from components/mus/vm/test_server_view_delegate.h) | 8 | ||||
-rw-r--r-- | components/mus/ws/view_coordinate_conversions.cc (renamed from components/mus/vm/view_coordinate_conversions.cc) | 4 | ||||
-rw-r--r-- | components/mus/ws/view_coordinate_conversions.h (renamed from components/mus/vm/view_coordinate_conversions.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/view_coordinate_conversions_unittest.cc (renamed from components/mus/vm/view_coordinate_conversions_unittest.cc) | 8 | ||||
-rw-r--r-- | components/mus/ws/view_manager_client_apptest.cc (renamed from components/mus/vm/view_manager_client_apptest.cc) | 0 | ||||
-rw-r--r-- | components/mus/ws/view_tree_apptest.cc (renamed from components/mus/vm/view_tree_apptest.cc) | 4 | ||||
-rw-r--r-- | components/mus/ws/view_tree_host_connection.cc (renamed from components/mus/vm/view_tree_host_connection.cc) | 6 | ||||
-rw-r--r-- | components/mus/ws/view_tree_host_connection.h (renamed from components/mus/vm/view_tree_host_connection.h) | 10 | ||||
-rw-r--r-- | components/mus/ws/view_tree_host_delegate.h (renamed from components/mus/vm/view_tree_host_delegate.h) | 6 | ||||
-rw-r--r-- | components/mus/ws/view_tree_host_impl.cc (renamed from components/mus/vm/view_tree_host_impl.cc) | 12 | ||||
-rw-r--r-- | components/mus/ws/view_tree_host_impl.h (renamed from components/mus/vm/view_tree_host_impl.h) | 14 | ||||
-rw-r--r-- | components/mus/ws/view_tree_impl.cc (renamed from components/mus/vm/view_tree_impl.cc) | 14 | ||||
-rw-r--r-- | components/mus/ws/view_tree_impl.h (renamed from components/mus/vm/view_tree_impl.h) | 10 | ||||
-rw-r--r-- | components/mus/ws/view_tree_unittest.cc (renamed from components/mus/vm/view_tree_unittest.cc) | 20 | ||||
-rw-r--r-- | components/mus/ws/window_manager_access_policy.cc (renamed from components/mus/vm/window_manager_access_policy.cc) | 6 | ||||
-rw-r--r-- | components/mus/ws/window_manager_access_policy.h (renamed from components/mus/vm/window_manager_access_policy.h) | 8 | ||||
-rw-r--r-- | mandoline/BUILD.gn | 2 | ||||
-rw-r--r-- | mojo/runner/BUILD.gn | 4 |
59 files changed, 204 insertions, 204 deletions
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn index 9288830..02a3243 100644 --- a/components/html_viewer/BUILD.gn +++ b/components/html_viewer/BUILD.gn @@ -215,7 +215,7 @@ source_set("lib") { data_deps = [ "//components/clipboard", - "//components/mus/vm:lib", + "//components/mus/ws:lib", "//mojo/services/network:network", "//mojo/services/tracing", ] diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc index 0a31667..78f8b22 100644 --- a/components/html_viewer/html_document.cc +++ b/components/html_viewer/html_document.cc @@ -21,7 +21,7 @@ #include "components/html_viewer/web_url_loader_impl.h" #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_tree_connection.h" -#include "components/mus/vm/ids.h" +#include "components/mus/ws/ids.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/connect.h" #include "mojo/application/public/interfaces/shell.mojom.h" diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc index 5a7bd9e..37f9bce 100644 --- a/components/html_viewer/html_frame.cc +++ b/components/html_viewer/html_frame.cc @@ -37,7 +37,7 @@ #include "components/mus/public/cpp/scoped_window_ptr.h" #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_tree_connection.h" -#include "components/mus/vm/ids.h" +#include "components/mus/ws/ids.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/connect.h" #include "mojo/application/public/interfaces/shell.mojom.h" diff --git a/components/mus/BUILD.gn b/components/mus/BUILD.gn index ec34ba8..3ebc201 100644 --- a/components/mus/BUILD.gn +++ b/components/mus/BUILD.gn @@ -52,7 +52,7 @@ source_set("lib") { "//components/mus/public/cpp:common", "//components/mus/public/interfaces", "//components/mus/surfaces", - "//components/mus/vm:lib", + "//components/mus/ws:lib", "//mojo/application/public/cpp", "//mojo/common:common_base", "//mojo/common:tracing_impl", diff --git a/components/mus/gles2/BUILD.gn b/components/mus/gles2/BUILD.gn index be5e03c..9c0929f 100644 --- a/components/mus/gles2/BUILD.gn +++ b/components/mus/gles2/BUILD.gn @@ -5,7 +5,7 @@ source_set("gles2") { visibility = [ "//components/mus:*", - "//components/mus/vm:*", + "//components/mus/ws:*", "//components/mus/surfaces:*", "//mojo/runner:lib", # For android ] diff --git a/components/mus/mus_app.cc b/components/mus/mus_app.cc index 3cb357a..335dbca 100644 --- a/components/mus/mus_app.cc +++ b/components/mus/mus_app.cc @@ -8,11 +8,11 @@ #include "components/mus/gles2/gpu_impl.h" #include "components/mus/public/cpp/args.h" #include "components/mus/surfaces/surfaces_scheduler.h" -#include "components/mus/vm/client_connection.h" -#include "components/mus/vm/connection_manager.h" -#include "components/mus/vm/view_tree_host_connection.h" -#include "components/mus/vm/view_tree_host_impl.h" -#include "components/mus/vm/view_tree_impl.h" +#include "components/mus/ws/client_connection.h" +#include "components/mus/ws/connection_manager.h" +#include "components/mus/ws/view_tree_host_connection.h" +#include "components/mus/ws/view_tree_host_impl.h" +#include "components/mus/ws/view_tree_impl.h" #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_runner.h" diff --git a/components/mus/mus_app.h b/components/mus/mus_app.h index c46ab0c..9ffd437 100644 --- a/components/mus/mus_app.h +++ b/components/mus/mus_app.h @@ -11,7 +11,7 @@ #include "components/mus/public/interfaces/gpu.mojom.h" #include "components/mus/public/interfaces/view_tree.mojom.h" #include "components/mus/public/interfaces/view_tree_host.mojom.h" -#include "components/mus/vm/connection_manager_delegate.h" +#include "components/mus/ws/connection_manager_delegate.h" #include "mojo/application/public/cpp/app_lifetime_helper.h" #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/interface_factory.h" diff --git a/components/mus/vm/BUILD.gn b/components/mus/ws/BUILD.gn index ec53201..ec53201 100644 --- a/components/mus/vm/BUILD.gn +++ b/components/mus/ws/BUILD.gn diff --git a/components/mus/vm/access_policy.h b/components/mus/ws/access_policy.h index f2862b4..bcaefdd 100644 --- a/components/mus/vm/access_policy.h +++ b/components/mus/ws/access_policy.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_MUS_VM_ACCESS_POLICY_H_ -#define COMPONENTS_MUS_VM_ACCESS_POLICY_H_ +#ifndef COMPONENTS_MUS_WS_ACCESS_POLICY_H_ +#define COMPONENTS_MUS_WS_ACCESS_POLICY_H_ #include "components/mus/public/interfaces/mus_constants.mojom.h" -#include "components/mus/vm/ids.h" +#include "components/mus/ws/ids.h" namespace mus { @@ -56,4 +56,4 @@ class AccessPolicy { } // namespace mus -#endif // COMPONENTS_MUS_VM_ACCESS_POLICY_H_ +#endif // COMPONENTS_MUS_WS_ACCESS_POLICY_H_ diff --git a/components/mus/vm/access_policy_delegate.h b/components/mus/ws/access_policy_delegate.h index 60f5e93..ff99a86 100644 --- a/components/mus/vm/access_policy_delegate.h +++ b/components/mus/ws/access_policy_delegate.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_MUS_VM_ACCESS_POLICY_DELEGATE_H_ -#define COMPONENTS_MUS_VM_ACCESS_POLICY_DELEGATE_H_ +#ifndef COMPONENTS_MUS_WS_ACCESS_POLICY_DELEGATE_H_ +#define COMPONENTS_MUS_WS_ACCESS_POLICY_DELEGATE_H_ #include <vector> #include "base/containers/hash_tables.h" -#include "components/mus/vm/ids.h" +#include "components/mus/ws/ids.h" namespace mus { @@ -37,4 +37,4 @@ class AccessPolicyDelegate { } // namespace mus -#endif // COMPONENTS_MUS_VM_ACCESS_POLICY_DELEGATE_H_ +#endif // COMPONENTS_MUS_WS_ACCESS_POLICY_DELEGATE_H_ diff --git a/components/mus/vm/client_connection.cc b/components/mus/ws/client_connection.cc index 48c8a63..06fa39a2 100644 --- a/components/mus/vm/client_connection.cc +++ b/components/mus/ws/client_connection.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/client_connection.h" +#include "components/mus/ws/client_connection.h" -#include "components/mus/vm/connection_manager.h" -#include "components/mus/vm/view_tree_impl.h" +#include "components/mus/ws/connection_manager.h" +#include "components/mus/ws/view_tree_impl.h" namespace mus { diff --git a/components/mus/vm/client_connection.h b/components/mus/ws/client_connection.h index ecae3a9..a455079 100644 --- a/components/mus/vm/client_connection.h +++ b/components/mus/ws/client_connection.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_VM_CLIENT_CONNECTION_H_ -#define COMPONENTS_MUS_VM_CLIENT_CONNECTION_H_ +#ifndef COMPONENTS_MUS_WS_CLIENT_CONNECTION_H_ +#define COMPONENTS_MUS_WS_CLIENT_CONNECTION_H_ #include "base/memory/scoped_ptr.h" #include "components/mus/public/interfaces/view_tree.mojom.h" @@ -54,4 +54,4 @@ class DefaultClientConnection : public ClientConnection { } // namespace mus -#endif // COMPONENTS_MUS_VM_CLIENT_CONNECTION_H_ +#endif // COMPONENTS_MUS_WS_CLIENT_CONNECTION_H_ diff --git a/components/mus/vm/connection_manager.cc b/components/mus/ws/connection_manager.cc index 79adc98..51ccdb1 100644 --- a/components/mus/vm/connection_manager.cc +++ b/components/mus/ws/connection_manager.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/connection_manager.h" +#include "components/mus/ws/connection_manager.h" #include "base/logging.h" #include "base/stl_util.h" -#include "components/mus/vm/client_connection.h" -#include "components/mus/vm/connection_manager_delegate.h" -#include "components/mus/vm/server_view.h" -#include "components/mus/vm/view_coordinate_conversions.h" -#include "components/mus/vm/view_tree_host_connection.h" -#include "components/mus/vm/view_tree_impl.h" +#include "components/mus/ws/client_connection.h" +#include "components/mus/ws/connection_manager_delegate.h" +#include "components/mus/ws/server_view.h" +#include "components/mus/ws/view_coordinate_conversions.h" +#include "components/mus/ws/view_tree_host_connection.h" +#include "components/mus/ws/view_tree_impl.h" #include "mojo/application/public/cpp/application_connection.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/input_events/input_events_type_converters.h" diff --git a/components/mus/vm/connection_manager.h b/components/mus/ws/connection_manager.h index bfbbd23..d3f0b0a 100644 --- a/components/mus/vm/connection_manager.h +++ b/components/mus/ws/connection_manager.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_VM_CONNECTION_MANAGER_H_ -#define COMPONENTS_MUS_VM_CONNECTION_MANAGER_H_ +#ifndef COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ +#define COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ #include <map> #include <set> @@ -14,11 +14,11 @@ #include "components/mus/public/interfaces/view_tree.mojom.h" #include "components/mus/public/interfaces/view_tree_host.mojom.h" #include "components/mus/surfaces/surfaces_state.h" -#include "components/mus/vm/focus_controller_delegate.h" -#include "components/mus/vm/ids.h" -#include "components/mus/vm/server_view_delegate.h" -#include "components/mus/vm/server_view_observer.h" -#include "components/mus/vm/view_tree_host_impl.h" +#include "components/mus/ws/focus_controller_delegate.h" +#include "components/mus/ws/ids.h" +#include "components/mus/ws/server_view_delegate.h" +#include "components/mus/ws/server_view_observer.h" +#include "components/mus/ws/view_tree_host_impl.h" #include "mojo/converters/surfaces/custom_surface_converter.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" @@ -249,4 +249,4 @@ class ConnectionManager : public ServerViewDelegate, public ServerViewObserver { } // namespace mus -#endif // COMPONENTS_MUS_VM_CONNECTION_MANAGER_H_ +#endif // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_ diff --git a/components/mus/vm/connection_manager_delegate.h b/components/mus/ws/connection_manager_delegate.h index a96071b..d72f363 100644 --- a/components/mus/vm/connection_manager_delegate.h +++ b/components/mus/ws/connection_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 COMPONENTS_MUS_VM_CONNECTION_MANAGER_DELEGATE_H_ -#define COMPONENTS_MUS_VM_CONNECTION_MANAGER_DELEGATE_H_ +#ifndef COMPONENTS_MUS_WS_CONNECTION_MANAGER_DELEGATE_H_ +#define COMPONENTS_MUS_WS_CONNECTION_MANAGER_DELEGATE_H_ #include <string> @@ -45,4 +45,4 @@ class ConnectionManagerDelegate { } // namespace mus -#endif // COMPONENTS_MUS_VM_CONNECTION_MANAGER_DELEGATE_H_ +#endif // COMPONENTS_MUS_WS_CONNECTION_MANAGER_DELEGATE_H_ diff --git a/components/mus/vm/default_access_policy.cc b/components/mus/ws/default_access_policy.cc index f2a049a..8bf8eb3 100644 --- a/components/mus/vm/default_access_policy.cc +++ b/components/mus/ws/default_access_policy.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/default_access_policy.h" +#include "components/mus/ws/default_access_policy.h" -#include "components/mus/vm/access_policy_delegate.h" -#include "components/mus/vm/server_view.h" +#include "components/mus/ws/access_policy_delegate.h" +#include "components/mus/ws/server_view.h" namespace mus { diff --git a/components/mus/vm/default_access_policy.h b/components/mus/ws/default_access_policy.h index 6bda02e..a05a22e 100644 --- a/components/mus/vm/default_access_policy.h +++ b/components/mus/ws/default_access_policy.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_MUS_VM_DEFAULT_ACCESS_POLICY_H_ -#define COMPONENTS_MUS_VM_DEFAULT_ACCESS_POLICY_H_ +#ifndef COMPONENTS_MUS_WS_DEFAULT_ACCESS_POLICY_H_ +#define COMPONENTS_MUS_WS_DEFAULT_ACCESS_POLICY_H_ #include "base/basictypes.h" -#include "components/mus/vm/access_policy.h" +#include "components/mus/ws/access_policy.h" namespace mus { @@ -54,4 +54,4 @@ class DefaultAccessPolicy : public AccessPolicy { } // namespace mus -#endif // COMPONENTS_MUS_VM_DEFAULT_ACCESS_POLICY_H_ +#endif // COMPONENTS_MUS_WS_DEFAULT_ACCESS_POLICY_H_ diff --git a/components/mus/vm/display_manager.cc b/components/mus/ws/display_manager.cc index 3ff9fb2..3f7eebf 100644 --- a/components/mus/vm/display_manager.cc +++ b/components/mus/ws/display_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/display_manager.h" +#include "components/mus/ws/display_manager.h" #include "base/numerics/safe_conversions.h" #include "cc/output/compositor_frame.h" @@ -14,9 +14,9 @@ #include "components/mus/public/interfaces/gpu.mojom.h" #include "components/mus/public/interfaces/quads.mojom.h" #include "components/mus/surfaces/surfaces_state.h" -#include "components/mus/vm/display_manager_factory.h" -#include "components/mus/vm/server_view.h" -#include "components/mus/vm/view_coordinate_conversions.h" +#include "components/mus/ws/display_manager_factory.h" +#include "components/mus/ws/server_view.h" +#include "components/mus/ws/view_coordinate_conversions.h" #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/converters/geometry/geometry_type_converters.h" diff --git a/components/mus/vm/display_manager.h b/components/mus/ws/display_manager.h index 14d973e..e7b0d0f 100644 --- a/components/mus/vm/display_manager.h +++ b/components/mus/ws/display_manager.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_VM_DISPLAY_MANAGER_H_ -#define COMPONENTS_MUS_VM_DISPLAY_MANAGER_H_ +#ifndef COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ +#define COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ #include <map> @@ -13,7 +13,7 @@ #include "base/timer/timer.h" #include "components/mus/public/interfaces/view_tree.mojom.h" #include "components/mus/surfaces/top_level_display_client.h" -#include "components/mus/vm/display_manager_delegate.h" +#include "components/mus/ws/display_manager_delegate.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" #include "ui/gfx/geometry/rect.h" #include "ui/platform_window/platform_window_delegate.h" @@ -146,4 +146,4 @@ class DefaultDisplayManager : public DisplayManager, } // namespace mus -#endif // COMPONENTS_MUS_VM_DISPLAY_MANAGER_H_ +#endif // COMPONENTS_MUS_WS_DISPLAY_MANAGER_H_ diff --git a/components/mus/vm/display_manager_delegate.h b/components/mus/ws/display_manager_delegate.h index e37d3a8..3b2c2fd 100644 --- a/components/mus/vm/display_manager_delegate.h +++ b/components/mus/ws/display_manager_delegate.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_MUS_VM_DISPLAY_MANAGER_DELEGATE_H_ -#define COMPONENTS_MUS_VM_DISPLAY_MANAGER_DELEGATE_H_ +#ifndef COMPONENTS_MUS_WS_DISPLAY_MANAGER_DELEGATE_H_ +#define COMPONENTS_MUS_WS_DISPLAY_MANAGER_DELEGATE_H_ #include "components/mus/public/interfaces/view_tree.mojom.h" -#include "components/mus/vm/ids.h" +#include "components/mus/ws/ids.h" namespace cc { struct SurfaceId; @@ -43,4 +43,4 @@ class DisplayManagerDelegate { } // namespace mus -#endif // COMPONENTS_MUS_VM_DISPLAY_MANAGER_DELEGATE_H_ +#endif // COMPONENTS_MUS_WS_DISPLAY_MANAGER_DELEGATE_H_ diff --git a/components/mus/vm/display_manager_factory.h b/components/mus/ws/display_manager_factory.h index 358b1bc..adfeb23 100644 --- a/components/mus/vm/display_manager_factory.h +++ b/components/mus/ws/display_manager_factory.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_VM_DISPLAY_MANAGER_FACTORY_H_ -#define COMPONENTS_MUS_VM_DISPLAY_MANAGER_FACTORY_H_ +#ifndef COMPONENTS_MUS_WS_DISPLAY_MANAGER_FACTORY_H_ +#define COMPONENTS_MUS_WS_DISPLAY_MANAGER_FACTORY_H_ #include "components/mus/gles2/gpu_state.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/callback.h" @@ -28,4 +28,4 @@ class DisplayManagerFactory { } // namespace mus -#endif // COMPONENTS_MUS_VM_DISPLAY_MANAGER_FACTORY_H_ +#endif // COMPONENTS_MUS_WS_DISPLAY_MANAGER_FACTORY_H_ diff --git a/components/mus/vm/event_dispatcher.cc b/components/mus/ws/event_dispatcher.cc index 2fd0a6b..f379df3 100644 --- a/components/mus/vm/event_dispatcher.cc +++ b/components/mus/ws/event_dispatcher.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/event_dispatcher.h" +#include "components/mus/ws/event_dispatcher.h" #include "cc/surfaces/surface_id.h" #include "components/mus/surfaces/surfaces_state.h" -#include "components/mus/vm/connection_manager.h" -#include "components/mus/vm/server_view.h" -#include "components/mus/vm/server_view_delegate.h" -#include "components/mus/vm/view_coordinate_conversions.h" -#include "components/mus/vm/view_tree_host_impl.h" +#include "components/mus/ws/connection_manager.h" +#include "components/mus/ws/server_view.h" +#include "components/mus/ws/server_view_delegate.h" +#include "components/mus/ws/view_coordinate_conversions.h" +#include "components/mus/ws/view_tree_host_impl.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/point_f.h" diff --git a/components/mus/vm/event_dispatcher.h b/components/mus/ws/event_dispatcher.h index 28cecc4..b515ec7 100644 --- a/components/mus/vm/event_dispatcher.h +++ b/components/mus/ws/event_dispatcher.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_VM_EVENT_DISPATCHER_H_ -#define COMPONENTS_MUS_VM_EVENT_DISPATCHER_H_ +#ifndef COMPONENTS_MUS_WS_EVENT_DISPATCHER_H_ +#define COMPONENTS_MUS_WS_EVENT_DISPATCHER_H_ #include <map> @@ -80,4 +80,4 @@ class EventDispatcher { } // namespace mus -#endif // COMPONENTS_MUS_VM_EVENT_DISPATCHER_H_ +#endif // COMPONENTS_MUS_WS_EVENT_DISPATCHER_H_ diff --git a/components/mus/vm/focus_controller.cc b/components/mus/ws/focus_controller.cc index 1d0d893..f02fed6 100644 --- a/components/mus/vm/focus_controller.cc +++ b/components/mus/ws/focus_controller.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/focus_controller.h" +#include "components/mus/ws/focus_controller.h" -#include "components/mus/vm/focus_controller_delegate.h" -#include "components/mus/vm/server_view.h" -#include "components/mus/vm/server_view_drawn_tracker.h" +#include "components/mus/ws/focus_controller_delegate.h" +#include "components/mus/ws/server_view.h" +#include "components/mus/ws/server_view_drawn_tracker.h" namespace mus { diff --git a/components/mus/vm/focus_controller.h b/components/mus/ws/focus_controller.h index d0c17d7..c756ed2 100644 --- a/components/mus/vm/focus_controller.h +++ b/components/mus/ws/focus_controller.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_MUS_VM_FOCUS_CONTROLLER_H_ -#define COMPONENTS_MUS_VM_FOCUS_CONTROLLER_H_ +#ifndef COMPONENTS_MUS_WS_FOCUS_CONTROLLER_H_ +#define COMPONENTS_MUS_WS_FOCUS_CONTROLLER_H_ #include "base/memory/scoped_ptr.h" -#include "components/mus/vm/server_view_drawn_tracker_observer.h" +#include "components/mus/ws/server_view_drawn_tracker_observer.h" namespace mus { @@ -49,4 +49,4 @@ class FocusController : public ServerViewDrawnTrackerObserver { } // namespace mus -#endif // COMPONENTS_MUS_VM_FOCUS_CONTROLLER_H_ +#endif // COMPONENTS_MUS_WS_FOCUS_CONTROLLER_H_ diff --git a/components/mus/vm/focus_controller_delegate.h b/components/mus/ws/focus_controller_delegate.h index c0a77dd..ee91a5e 100644 --- a/components/mus/vm/focus_controller_delegate.h +++ b/components/mus/ws/focus_controller_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 COMPONENTS_MUS_VM_FOCUS_CONTROLLER_DELEGATE_H_ -#define COMPONENTS_MUS_VM_FOCUS_CONTROLLER_DELEGATE_H_ +#ifndef COMPONENTS_MUS_WS_FOCUS_CONTROLLER_DELEGATE_H_ +#define COMPONENTS_MUS_WS_FOCUS_CONTROLLER_DELEGATE_H_ namespace mus { @@ -20,4 +20,4 @@ class FocusControllerDelegate { } // namespace mus -#endif // COMPONENTS_MUS_VM_FOCUS_CONTROLLER_DELEGATE_H_ +#endif // COMPONENTS_MUS_WS_FOCUS_CONTROLLER_DELEGATE_H_ diff --git a/components/mus/vm/focus_controller_unittest.cc b/components/mus/ws/focus_controller_unittest.cc index 5e1c3c1..5a7ad15 100644 --- a/components/mus/vm/focus_controller_unittest.cc +++ b/components/mus/ws/focus_controller_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/focus_controller.h" +#include "components/mus/ws/focus_controller.h" -#include "components/mus/vm/focus_controller_delegate.h" -#include "components/mus/vm/server_view.h" -#include "components/mus/vm/test_server_view_delegate.h" +#include "components/mus/ws/focus_controller_delegate.h" +#include "components/mus/ws/server_view.h" +#include "components/mus/ws/test_server_view_delegate.h" #include "testing/gtest/include/gtest/gtest.h" namespace mus { diff --git a/components/mus/vm/ids.h b/components/mus/ws/ids.h index de84266..a788359 100644 --- a/components/mus/vm/ids.h +++ b/components/mus/ws/ids.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_VM_IDS_H_ -#define COMPONENTS_MUS_VM_IDS_H_ +#ifndef COMPONENTS_MUS_WS_IDS_H_ +#define COMPONENTS_MUS_WS_IDS_H_ #include "components/mus/public/cpp/types.h" #include "components/mus/public/cpp/util.h" @@ -58,4 +58,4 @@ inline ViewId RootViewId(uint16_t index) { } // namespace mus -#endif // COMPONENTS_MUS_VM_IDS_H_ +#endif // COMPONENTS_MUS_WS_IDS_H_ diff --git a/components/mus/vm/server_view.cc b/components/mus/ws/server_view.cc index 5b90a56..9eaa974 100644 --- a/components/mus/vm/server_view.cc +++ b/components/mus/ws/server_view.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/server_view.h" +#include "components/mus/ws/server_view.h" #include <inttypes.h> #include "base/strings/stringprintf.h" -#include "components/mus/vm/server_view_delegate.h" -#include "components/mus/vm/server_view_observer.h" +#include "components/mus/ws/server_view_delegate.h" +#include "components/mus/ws/server_view_observer.h" #include "mojo/converters/geometry/geometry_type_converters.h" namespace mus { diff --git a/components/mus/vm/server_view.h b/components/mus/ws/server_view.h index e9b1653..8cebcfc 100644 --- a/components/mus/vm/server_view.h +++ b/components/mus/ws/server_view.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_VM_SERVER_VIEW_H_ -#define COMPONENTS_MUS_VM_SERVER_VIEW_H_ +#ifndef COMPONENTS_MUS_WS_SERVER_VIEW_H_ +#define COMPONENTS_MUS_WS_SERVER_VIEW_H_ #include <vector> @@ -11,8 +11,8 @@ #include "base/observer_list.h" #include "components/mus/public/interfaces/compositor_frame.mojom.h" #include "components/mus/public/interfaces/view_tree.mojom.h" -#include "components/mus/vm/ids.h" -#include "components/mus/vm/server_view_surface.h" +#include "components/mus/ws/ids.h" +#include "components/mus/ws/server_view_surface.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/transform.h" @@ -139,4 +139,4 @@ class ServerView { } // namespace mus -#endif // COMPONENTS_MUS_VM_SERVER_VIEW_H_ +#endif // COMPONENTS_MUS_WS_SERVER_VIEW_H_ diff --git a/components/mus/vm/server_view_delegate.h b/components/mus/ws/server_view_delegate.h index a1dd884..58b40a3 100644 --- a/components/mus/vm/server_view_delegate.h +++ b/components/mus/ws/server_view_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 COMPONENTS_MUS_VM_SERVER_VIEW_DELEGATE_H_ -#define COMPONENTS_MUS_VM_SERVER_VIEW_DELEGATE_H_ +#ifndef COMPONENTS_MUS_WS_SERVER_VIEW_DELEGATE_H_ +#define COMPONENTS_MUS_WS_SERVER_VIEW_DELEGATE_H_ #include "base/memory/scoped_ptr.h" #include "components/mus/public/interfaces/mus_constants.mojom.h" @@ -30,4 +30,4 @@ class ServerViewDelegate { } // namespace mus -#endif // COMPONENTS_MUS_VM_SERVER_VIEW_DELEGATE_H_ +#endif // COMPONENTS_MUS_WS_SERVER_VIEW_DELEGATE_H_ diff --git a/components/mus/vm/server_view_drawn_tracker.cc b/components/mus/ws/server_view_drawn_tracker.cc index 9441511..8b28d08 100644 --- a/components/mus/vm/server_view_drawn_tracker.cc +++ b/components/mus/ws/server_view_drawn_tracker.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/server_view_drawn_tracker.h" +#include "components/mus/ws/server_view_drawn_tracker.h" -#include "components/mus/vm/server_view.h" -#include "components/mus/vm/server_view_drawn_tracker_observer.h" +#include "components/mus/ws/server_view.h" +#include "components/mus/ws/server_view_drawn_tracker_observer.h" namespace mus { diff --git a/components/mus/vm/server_view_drawn_tracker.h b/components/mus/ws/server_view_drawn_tracker.h index a3f4f99..ebf1e4a 100644 --- a/components/mus/vm/server_view_drawn_tracker.h +++ b/components/mus/ws/server_view_drawn_tracker.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_MUS_VM_SERVER_VIEW_DRAWN_TRACKER_H_ -#define COMPONENTS_MUS_VM_SERVER_VIEW_DRAWN_TRACKER_H_ +#ifndef COMPONENTS_MUS_WS_SERVER_VIEW_DRAWN_TRACKER_H_ +#define COMPONENTS_MUS_WS_SERVER_VIEW_DRAWN_TRACKER_H_ #include <set> #include "base/basictypes.h" -#include "components/mus/vm/server_view_observer.h" +#include "components/mus/ws/server_view_observer.h" namespace mus { @@ -53,4 +53,4 @@ class ServerViewDrawnTracker : public ServerViewObserver { } // namespace mus -#endif // COMPONENTS_MUS_VM_SERVER_VIEW_DRAWN_TRACKER_H_ +#endif // COMPONENTS_MUS_WS_SERVER_VIEW_DRAWN_TRACKER_H_ diff --git a/components/mus/vm/server_view_drawn_tracker_observer.h b/components/mus/ws/server_view_drawn_tracker_observer.h index 51239be..a892f5e 100644 --- a/components/mus/vm/server_view_drawn_tracker_observer.h +++ b/components/mus/ws/server_view_drawn_tracker_observer.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_VM_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_ -#define COMPONENTS_MUS_VM_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_ +#ifndef COMPONENTS_MUS_WS_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_ +#define COMPONENTS_MUS_WS_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_ namespace mus { @@ -25,4 +25,4 @@ class ServerViewDrawnTrackerObserver { } // namespace mus -#endif // COMPONENTS_MUS_VM_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_ +#endif // COMPONENTS_MUS_WS_SERVER_VIEW_DRAWN_TRACKER_OBSERVER_H_ diff --git a/components/mus/vm/server_view_drawn_tracker_unittest.cc b/components/mus/ws/server_view_drawn_tracker_unittest.cc index 49db3db..a8b5122 100644 --- a/components/mus/vm/server_view_drawn_tracker_unittest.cc +++ b/components/mus/ws/server_view_drawn_tracker_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/server_view_drawn_tracker.h" +#include "components/mus/ws/server_view_drawn_tracker.h" -#include "components/mus/vm/server_view.h" -#include "components/mus/vm/server_view_drawn_tracker_observer.h" -#include "components/mus/vm/test_server_view_delegate.h" +#include "components/mus/ws/server_view.h" +#include "components/mus/ws/server_view_drawn_tracker_observer.h" +#include "components/mus/ws/test_server_view_delegate.h" #include "testing/gtest/include/gtest/gtest.h" namespace mus { diff --git a/components/mus/vm/server_view_observer.h b/components/mus/ws/server_view_observer.h index a4b151c..2b82d6b 100644 --- a/components/mus/vm/server_view_observer.h +++ b/components/mus/ws/server_view_observer.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_VM_SERVER_VIEW_OBSERVER_H_ -#define COMPONENTS_MUS_VM_SERVER_VIEW_OBSERVER_H_ +#ifndef COMPONENTS_MUS_WS_SERVER_VIEW_OBSERVER_H_ +#define COMPONENTS_MUS_WS_SERVER_VIEW_OBSERVER_H_ #include "components/mus/public/interfaces/mus_constants.mojom.h" @@ -67,4 +67,4 @@ class ServerViewObserver { } // namespace mus -#endif // COMPONENTS_MUS_VM_SERVER_VIEW_OBSERVER_H_ +#endif // COMPONENTS_MUS_WS_SERVER_VIEW_OBSERVER_H_ diff --git a/components/mus/vm/server_view_surface.cc b/components/mus/ws/server_view_surface.cc index 3959a83..18c2ff9 100644 --- a/components/mus/vm/server_view_surface.cc +++ b/components/mus/ws/server_view_surface.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/server_view_surface.h" +#include "components/mus/ws/server_view_surface.h" #include "cc/output/compositor_frame.h" #include "cc/quads/shared_quad_state.h" #include "cc/quads/surface_draw_quad.h" #include "components/mus/surfaces/surfaces_state.h" -#include "components/mus/vm/server_view.h" -#include "components/mus/vm/server_view_delegate.h" +#include "components/mus/ws/server_view.h" +#include "components/mus/ws/server_view_delegate.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" diff --git a/components/mus/vm/server_view_surface.h b/components/mus/ws/server_view_surface.h index 5f5096b..f743e6f 100644 --- a/components/mus/vm/server_view_surface.h +++ b/components/mus/ws/server_view_surface.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_MUS_VM_SERVER_VIEW_SURFACE_H_ -#define COMPONENTS_MUS_VM_SERVER_VIEW_SURFACE_H_ +#ifndef COMPONENTS_MUS_WS_SERVER_VIEW_SURFACE_H_ +#define COMPONENTS_MUS_WS_SERVER_VIEW_SURFACE_H_ #include "cc/surfaces/surface_factory.h" #include "cc/surfaces/surface_factory_client.h" #include "cc/surfaces/surface_id.h" #include "cc/surfaces/surface_id_allocator.h" #include "components/mus/public/interfaces/compositor_frame.mojom.h" -#include "components/mus/vm/ids.h" +#include "components/mus/ws/ids.h" #include "mojo/converters/surfaces/custom_surface_converter.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" @@ -83,4 +83,4 @@ class ServerViewSurface : public mojo::Surface, } // namespace mus -#endif // COMPONENTS_MUS_VM_SERVER_VIEW_SURFACE_H_ +#endif // COMPONENTS_MUS_WS_SERVER_VIEW_SURFACE_H_ diff --git a/components/mus/vm/test_change_tracker.cc b/components/mus/ws/test_change_tracker.cc index 9ff3b11..4e4f09b 100644 --- a/components/mus/vm/test_change_tracker.cc +++ b/components/mus/ws/test_change_tracker.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/test_change_tracker.h" +#include "components/mus/ws/test_change_tracker.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" diff --git a/components/mus/vm/test_change_tracker.h b/components/mus/ws/test_change_tracker.h index aa1514b..aa025719b 100644 --- a/components/mus/vm/test_change_tracker.h +++ b/components/mus/ws/test_change_tracker.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_VM_TEST_CHANGE_TRACKER_H_ -#define COMPONENTS_MUS_VM_TEST_CHANGE_TRACKER_H_ +#ifndef COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ +#define COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ #include <string> #include <vector> @@ -153,4 +153,4 @@ class TestChangeTracker { } // namespace mus -#endif // COMPONENTS_MUS_VM_TEST_CHANGE_TRACKER_H_ +#endif // COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_ diff --git a/components/mus/vm/test_server_view_delegate.cc b/components/mus/ws/test_server_view_delegate.cc index 3ab7393..109d8be 100644 --- a/components/mus/vm/test_server_view_delegate.cc +++ b/components/mus/ws/test_server_view_delegate.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/test_server_view_delegate.h" -#include "components/mus/vm/server_view.h" +#include "components/mus/ws/test_server_view_delegate.h" +#include "components/mus/ws/server_view.h" namespace mus { diff --git a/components/mus/vm/test_server_view_delegate.h b/components/mus/ws/test_server_view_delegate.h index 4f3d069..ae591ca 100644 --- a/components/mus/vm/test_server_view_delegate.h +++ b/components/mus/ws/test_server_view_delegate.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_MUS_VM_TEST_SERVER_VIEW_DELEGATE_H_ -#define COMPONENTS_MUS_VM_TEST_SERVER_VIEW_DELEGATE_H_ +#ifndef COMPONENTS_MUS_WS_TEST_SERVER_VIEW_DELEGATE_H_ +#define COMPONENTS_MUS_WS_TEST_SERVER_VIEW_DELEGATE_H_ #include "base/basictypes.h" -#include "components/mus/vm/server_view_delegate.h" +#include "components/mus/ws/server_view_delegate.h" namespace mus { @@ -32,4 +32,4 @@ class TestServerViewDelegate : public ServerViewDelegate { } // namespace mus -#endif // COMPONENTS_MUS_VM_TEST_SERVER_VIEW_DELEGATE_H_ +#endif // COMPONENTS_MUS_WS_TEST_SERVER_VIEW_DELEGATE_H_ diff --git a/components/mus/vm/view_coordinate_conversions.cc b/components/mus/ws/view_coordinate_conversions.cc index 57e0093..e0e34d8 100644 --- a/components/mus/vm/view_coordinate_conversions.cc +++ b/components/mus/ws/view_coordinate_conversions.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/view_coordinate_conversions.h" +#include "components/mus/ws/view_coordinate_conversions.h" -#include "components/mus/vm/server_view.h" +#include "components/mus/ws/server_view.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/geometry/point_f.h" diff --git a/components/mus/vm/view_coordinate_conversions.h b/components/mus/ws/view_coordinate_conversions.h index ed9e607..76e85cb 100644 --- a/components/mus/vm/view_coordinate_conversions.h +++ b/components/mus/ws/view_coordinate_conversions.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_VM_VIEW_COORDINATE_CONVERSIONS_H_ -#define COMPONENTS_MUS_VM_VIEW_COORDINATE_CONVERSIONS_H_ +#ifndef COMPONENTS_MUS_WS_VIEW_COORDINATE_CONVERSIONS_H_ +#define COMPONENTS_MUS_WS_VIEW_COORDINATE_CONVERSIONS_H_ namespace gfx { class Point; @@ -32,4 +32,4 @@ gfx::Rect ConvertRectBetweenViews(const ServerView* from, } // namespace mus -#endif // COMPONENTS_MUS_VM_VIEW_COORDINATE_CONVERSIONS_H_ +#endif // COMPONENTS_MUS_WS_VIEW_COORDINATE_CONVERSIONS_H_ diff --git a/components/mus/vm/view_coordinate_conversions_unittest.cc b/components/mus/ws/view_coordinate_conversions_unittest.cc index becea9b..bc758b0 100644 --- a/components/mus/vm/view_coordinate_conversions_unittest.cc +++ b/components/mus/ws/view_coordinate_conversions_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/view_coordinate_conversions.h" +#include "components/mus/ws/view_coordinate_conversions.h" -#include "components/mus/vm/server_view.h" -#include "components/mus/vm/server_view_delegate.h" -#include "components/mus/vm/test_server_view_delegate.h" +#include "components/mus/ws/server_view.h" +#include "components/mus/ws/server_view_delegate.h" +#include "components/mus/ws/test_server_view_delegate.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/rect.h" diff --git a/components/mus/vm/view_manager_client_apptest.cc b/components/mus/ws/view_manager_client_apptest.cc index 9d6e1af..9d6e1af 100644 --- a/components/mus/vm/view_manager_client_apptest.cc +++ b/components/mus/ws/view_manager_client_apptest.cc diff --git a/components/mus/vm/view_tree_apptest.cc b/components/mus/ws/view_tree_apptest.cc index 3f34d10..04aac5d 100644 --- a/components/mus/vm/view_tree_apptest.cc +++ b/components/mus/ws/view_tree_apptest.cc @@ -8,8 +8,8 @@ #include "base/strings/stringprintf.h" #include "components/mus/public/interfaces/view_tree.mojom.h" #include "components/mus/public/interfaces/view_tree_host.mojom.h" -#include "components/mus/vm/ids.h" -#include "components/mus/vm/test_change_tracker.h" +#include "components/mus/ws/ids.h" +#include "components/mus/ws/test_change_tracker.h" #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_test_base.h" diff --git a/components/mus/vm/view_tree_host_connection.cc b/components/mus/ws/view_tree_host_connection.cc index 7dcfbda..23ee9f2 100644 --- a/components/mus/vm/view_tree_host_connection.cc +++ b/components/mus/ws/view_tree_host_connection.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/view_tree_host_connection.h" +#include "components/mus/ws/view_tree_host_connection.h" -#include "components/mus/vm/connection_manager.h" -#include "components/mus/vm/view_tree_host_impl.h" +#include "components/mus/ws/connection_manager.h" +#include "components/mus/ws/view_tree_host_impl.h" namespace mus { diff --git a/components/mus/vm/view_tree_host_connection.h b/components/mus/ws/view_tree_host_connection.h index a84fbbb..62f4d93 100644 --- a/components/mus/vm/view_tree_host_connection.h +++ b/components/mus/ws/view_tree_host_connection.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_MUS_VM_VIEW_TREE_HOST_CONNECTION_H_ -#define COMPONENTS_MUS_VM_VIEW_TREE_HOST_CONNECTION_H_ +#ifndef COMPONENTS_MUS_WS_VIEW_TREE_HOST_CONNECTION_H_ +#define COMPONENTS_MUS_WS_VIEW_TREE_HOST_CONNECTION_H_ #include "base/memory/scoped_ptr.h" #include "components/mus/public/interfaces/view_tree_host.mojom.h" -#include "components/mus/vm/view_tree_host_delegate.h" -#include "components/mus/vm/view_tree_host_impl.h" +#include "components/mus/ws/view_tree_host_delegate.h" +#include "components/mus/ws/view_tree_host_impl.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace mus { @@ -79,4 +79,4 @@ class ViewTreeHostConnectionImpl : public ViewTreeHostConnection { } // namespace mus -#endif // COMPONENTS_MUS_VM_VIEW_TREE_HOST_CONNECTION_H_ +#endif // COMPONENTS_MUS_WS_VIEW_TREE_HOST_CONNECTION_H_ diff --git a/components/mus/vm/view_tree_host_delegate.h b/components/mus/ws/view_tree_host_delegate.h index 724c425..2551b87 100644 --- a/components/mus/vm/view_tree_host_delegate.h +++ b/components/mus/ws/view_tree_host_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 COMPONENTS_MUS_VM_VIEW_TREE_HOST_DELEGATE_H_ -#define COMPONENTS_MUS_VM_VIEW_TREE_HOST_DELEGATE_H_ +#ifndef COMPONENTS_MUS_WS_VIEW_TREE_HOST_DELEGATE_H_ +#define COMPONENTS_MUS_WS_VIEW_TREE_HOST_DELEGATE_H_ namespace mus { @@ -32,4 +32,4 @@ class ViewTreeHostDelegate { } // namespace mus -#endif // COMPONENTS_MUS_VM_VIEW_TREE_HOST_DELEGATE_H_ +#endif // COMPONENTS_MUS_WS_VIEW_TREE_HOST_DELEGATE_H_ diff --git a/components/mus/vm/view_tree_host_impl.cc b/components/mus/ws/view_tree_host_impl.cc index 5fdbdc5..636711d 100644 --- a/components/mus/vm/view_tree_host_impl.cc +++ b/components/mus/ws/view_tree_host_impl.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/view_tree_host_impl.h" +#include "components/mus/ws/view_tree_host_impl.h" #include "base/strings/utf_string_conversions.h" #include "components/mus/public/cpp/types.h" -#include "components/mus/vm/connection_manager.h" -#include "components/mus/vm/display_manager.h" -#include "components/mus/vm/focus_controller.h" -#include "components/mus/vm/view_tree_host_delegate.h" -#include "components/mus/vm/view_tree_impl.h" +#include "components/mus/ws/connection_manager.h" +#include "components/mus/ws/display_manager.h" +#include "components/mus/ws/focus_controller.h" +#include "components/mus/ws/view_tree_host_delegate.h" +#include "components/mus/ws/view_tree_impl.h" #include "mojo/common/common_type_converters.h" #include "mojo/converters/geometry/geometry_type_converters.h" diff --git a/components/mus/vm/view_tree_host_impl.h b/components/mus/ws/view_tree_host_impl.h index 2bda609..5d6968c 100644 --- a/components/mus/vm/view_tree_host_impl.h +++ b/components/mus/ws/view_tree_host_impl.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_MUS_VM_VIEW_TREE_HOST_IMPL_H_ -#define COMPONENTS_MUS_VM_VIEW_TREE_HOST_IMPL_H_ +#ifndef COMPONENTS_MUS_WS_VIEW_TREE_HOST_IMPL_H_ +#define COMPONENTS_MUS_WS_VIEW_TREE_HOST_IMPL_H_ #include "base/memory/scoped_ptr.h" #include "components/mus/public/cpp/types.h" #include "components/mus/public/interfaces/view_tree_host.mojom.h" -#include "components/mus/vm/display_manager.h" -#include "components/mus/vm/event_dispatcher.h" -#include "components/mus/vm/focus_controller_delegate.h" -#include "components/mus/vm/server_view.h" +#include "components/mus/ws/display_manager.h" +#include "components/mus/ws/event_dispatcher.h" +#include "components/mus/ws/focus_controller_delegate.h" +#include "components/mus/ws/server_view.h" namespace cc { class SurfaceManager; @@ -122,4 +122,4 @@ class ViewTreeHostImpl : public DisplayManagerDelegate, } // namespace mus -#endif // COMPONENTS_MUS_VM_VIEW_TREE_HOST_IMPL_H_ +#endif // COMPONENTS_MUS_WS_VIEW_TREE_HOST_IMPL_H_ diff --git a/components/mus/vm/view_tree_impl.cc b/components/mus/ws/view_tree_impl.cc index 40e2c07..6c485bc 100644 --- a/components/mus/vm/view_tree_impl.cc +++ b/components/mus/ws/view_tree_impl.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/view_tree_impl.h" +#include "components/mus/ws/view_tree_impl.h" #include "base/bind.h" #include "base/stl_util.h" -#include "components/mus/vm/connection_manager.h" -#include "components/mus/vm/default_access_policy.h" -#include "components/mus/vm/display_manager.h" -#include "components/mus/vm/server_view.h" -#include "components/mus/vm/view_tree_host_impl.h" -#include "components/mus/vm/window_manager_access_policy.h" +#include "components/mus/ws/connection_manager.h" +#include "components/mus/ws/default_access_policy.h" +#include "components/mus/ws/display_manager.h" +#include "components/mus/ws/server_view.h" +#include "components/mus/ws/view_tree_host_impl.h" +#include "components/mus/ws/window_manager_access_policy.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/ime/ime_type_converters.h" #include "mojo/converters/input_events/input_events_type_converters.h" diff --git a/components/mus/vm/view_tree_impl.h b/components/mus/ws/view_tree_impl.h index f573b55..2eda4d6 100644 --- a/components/mus/vm/view_tree_impl.h +++ b/components/mus/ws/view_tree_impl.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_VM_VIEW_TREE_IMPL_H_ -#define COMPONENTS_MUS_VM_VIEW_TREE_IMPL_H_ +#ifndef COMPONENTS_MUS_WS_VIEW_TREE_IMPL_H_ +#define COMPONENTS_MUS_WS_VIEW_TREE_IMPL_H_ #include <set> #include <string> @@ -15,8 +15,8 @@ #include "base/memory/scoped_ptr.h" #include "components/mus/public/interfaces/surface_id.mojom.h" #include "components/mus/public/interfaces/view_tree.mojom.h" -#include "components/mus/vm/access_policy_delegate.h" -#include "components/mus/vm/ids.h" +#include "components/mus/ws/access_policy_delegate.h" +#include "components/mus/ws/ids.h" namespace gfx { class Rect; @@ -249,4 +249,4 @@ class ViewTreeImpl : public mojo::ViewTree, public AccessPolicyDelegate { } // namespace mus -#endif // COMPONENTS_MUS_VM_VIEW_TREE_IMPL_H_ +#endif // COMPONENTS_MUS_WS_VIEW_TREE_IMPL_H_ diff --git a/components/mus/vm/view_tree_unittest.cc b/components/mus/ws/view_tree_unittest.cc index 352625c..caa3b83 100644 --- a/components/mus/vm/view_tree_unittest.cc +++ b/components/mus/ws/view_tree_unittest.cc @@ -10,16 +10,16 @@ #include "components/mus/public/cpp/util.h" #include "components/mus/public/interfaces/view_tree.mojom.h" #include "components/mus/surfaces/surfaces_state.h" -#include "components/mus/vm/client_connection.h" -#include "components/mus/vm/connection_manager.h" -#include "components/mus/vm/connection_manager_delegate.h" -#include "components/mus/vm/display_manager.h" -#include "components/mus/vm/display_manager_factory.h" -#include "components/mus/vm/ids.h" -#include "components/mus/vm/server_view.h" -#include "components/mus/vm/test_change_tracker.h" -#include "components/mus/vm/view_tree_host_connection.h" -#include "components/mus/vm/view_tree_impl.h" +#include "components/mus/ws/client_connection.h" +#include "components/mus/ws/connection_manager.h" +#include "components/mus/ws/connection_manager_delegate.h" +#include "components/mus/ws/display_manager.h" +#include "components/mus/ws/display_manager_factory.h" +#include "components/mus/ws/ids.h" +#include "components/mus/ws/server_view.h" +#include "components/mus/ws/test_change_tracker.h" +#include "components/mus/ws/view_tree_host_connection.h" +#include "components/mus/ws/view_tree_impl.h" #include "mojo/application/public/interfaces/service_provider.mojom.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/mus/vm/window_manager_access_policy.cc b/components/mus/ws/window_manager_access_policy.cc index 6cfb620..d5eda63 100644 --- a/components/mus/vm/window_manager_access_policy.cc +++ b/components/mus/ws/window_manager_access_policy.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/mus/vm/window_manager_access_policy.h" +#include "components/mus/ws/window_manager_access_policy.h" -#include "components/mus/vm/access_policy_delegate.h" -#include "components/mus/vm/server_view.h" +#include "components/mus/ws/access_policy_delegate.h" +#include "components/mus/ws/server_view.h" namespace mus { diff --git a/components/mus/vm/window_manager_access_policy.h b/components/mus/ws/window_manager_access_policy.h index b08946b..11c56e0 100644 --- a/components/mus/vm/window_manager_access_policy.h +++ b/components/mus/ws/window_manager_access_policy.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_MUS_VM_WINDOW_MANAGER_ACCESS_POLICY_H_ -#define COMPONENTS_MUS_VM_WINDOW_MANAGER_ACCESS_POLICY_H_ +#ifndef COMPONENTS_MUS_WS_WINDOW_MANAGER_ACCESS_POLICY_H_ +#define COMPONENTS_MUS_WS_WINDOW_MANAGER_ACCESS_POLICY_H_ #include "base/basictypes.h" -#include "components/mus/vm/access_policy.h" +#include "components/mus/ws/access_policy.h" namespace mus { @@ -52,4 +52,4 @@ class WindowManagerAccessPolicy : public AccessPolicy { } // namespace mus -#endif // COMPONENTS_MUS_VM_WINDOW_MANAGER_ACCESS_POLICY_H_ +#endif // COMPONENTS_MUS_WS_WINDOW_MANAGER_ACCESS_POLICY_H_ diff --git a/mandoline/BUILD.gn b/mandoline/BUILD.gn index b14dfd2..bc32cb0 100644 --- a/mandoline/BUILD.gn +++ b/mandoline/BUILD.gn @@ -45,7 +45,7 @@ group("tests") { "//components/html_viewer:apptests", "//components/html_viewer:html_viewer_unittests", "//components/html_viewer:layout_test_html_viewer", - "//components/mus/vm:tests", + "//components/mus/ws:tests", "//components/resource_provider:apptests", "//components/resource_provider:resource_provider_unittests", "//components/web_view:apptests", diff --git a/mojo/runner/BUILD.gn b/mojo/runner/BUILD.gn index 016f383..dc61e16 100644 --- a/mojo/runner/BUILD.gn +++ b/mojo/runner/BUILD.gn @@ -54,7 +54,7 @@ source_set("mojo_runner_lib") { deps += [ ":jni_headers", "//components/mus", - "//components/mus/vm:lib", + "//components/mus/ws:lib", "//mojo/shell", "//ui/gl", "//ui/platform_window/android", @@ -302,7 +302,7 @@ if (is_android) { ":bootstrap", ":bootstrap_java", "//components/clipboard:apptests", - "//components/mus/vm:apptests", + "//components/mus/ws:apptests", "//components/resource_provider:apptests", "//mojo/services/network:apptests", ] |