Move mus to //services/ui
NOTRY=true TBR=sky@chromium.org,dcheng@chromium.org http://crbug.com/623400 Review-Url: https://codereview.chromium.org/2119963002 Cr-Commit-Position: refs/heads/master@{#403603}
This commit is contained in:
ben
.git-blame-ignore-revsBUILD.gnWATCHLISTS
ash
mus
BUILD.gnDEPSaccelerator_registrar_impl.ccaccelerator_registrar_impl.haccelerator_registrar_unittest.ccapp_launch_unittest.cc
bridge
mus_layout_manager_adapter.ccmus_layout_manager_adapter.hwm_root_window_controller_mus.ccwm_shelf_mus.ccwm_shell_mus.ccwm_shell_mus.hwm_window_mus.ccwm_window_mus.h
disconnected_app_handler.hframe
layout_manager.cclayout_manager.hlayout_manager_unittest.ccnon_client_frame_controller.ccnon_client_frame_controller.hproperty_util.ccproperty_util.hroot_window_controller.ccroot_window_controller.hscreenlock_layout.ccshadow.hshadow_controller.ccshadow_controller.hshelf_layout_manager.ccstatus_layout_manager.cctest
user_window_controller_impl.ccuser_window_controller_impl.hwindow_manager.ccwindow_manager.hwindow_manager_application.ccwindow_manager_application.hwindow_manager_unittest.ccworkspace
sysui
chrome
app
browser
components
content
browser
common
renderer
BUILD.gnDEPS
mus
BUILD.gncompositor_mus_connection.hcompositor_mus_connection_unittest.ccrender_widget_mus_connection.ccrender_widget_mus_connection.hrender_widget_window_tree_client_factory.cc
render_thread_impl.cctest
mash
media/gpu/ipc/service
services
navigation
shell
public
cpp
ui
BUILD.gnDEPSOWNERS
clipboard
common
BUILD.gnDEPSOWNERSevent_matcher_util.ccevent_matcher_util.hgeneric_shared_memory_id_generator.ccgeneric_shared_memory_id_generator.hgpu_memory_buffer_impl.ccgpu_memory_buffer_impl.hgpu_service.ccgpu_service.hgpu_type_converters.ccgpu_type_converters.hgpu_type_converters_unittest.ccmojo_buffer_backing.ccmojo_buffer_backing.hmojo_gpu_memory_buffer.ccmojo_gpu_memory_buffer.hmojo_gpu_memory_buffer_manager.ccmojo_gpu_memory_buffer_manager.hmus_common_export.hmus_common_unittests_app_manifest.jsonrun_all_shelltests.ccswitches.ccswitches.htransient_window_utils.htypes.hutil.h
demo
gles2
BUILD.gnDEPSOWNERScommand_buffer_driver.cccommand_buffer_driver.hcommand_buffer_driver_manager.cccommand_buffer_driver_manager.hcommand_buffer_impl.cccommand_buffer_impl.hcommand_buffer_local.cccommand_buffer_local.hcommand_buffer_local_client.hcommand_buffer_task_runner.cccommand_buffer_task_runner.hgl_surface_adapter.ccgl_surface_adapter.hgpu_impl.ccgpu_impl.hgpu_memory_tracker.ccgpu_memory_tracker.hgpu_state.ccgpu_state.hozone_gpu_memory_buffer.ccozone_gpu_memory_buffer.hraster_thread_helper.ccraster_thread_helper.h
gpu
BUILD.gnDEPSOWNERS
display_compositor
BUILD.gncompositor_frame_sink_delegate.hcompositor_frame_sink_factory_impl.cccompositor_frame_sink_factory_impl.hcompositor_frame_sink_impl.cccompositor_frame_sink_impl.hdisplay_compositor_impl.ccdisplay_compositor_impl.hdisplay_impl.ccdisplay_impl.h
gpu_service_impl.ccgpu_service_impl.hgpu_service_mus.ccgpu_service_mus.hmus_gpu_memory_buffer_manager.ccmus_gpu_memory_buffer_manager.hmus_gpu_unittests_app_manifest.jsoninput_devices
main.ccmanifest.jsonmus_app.ccmus_app.hpublic
cpp
BUILD.gnDEPSOWNERScontext_provider.hgles2_context.h
input_devices
input_event_handler.hlib
DEPSOWNERScommand_buffer_client_impl.cccommand_buffer_client_impl.hcontext_provider.ccgles2_context.ccin_flight_change.ccin_flight_change.houtput_surface.ccproperty_type_converters.ccscoped_window_ptr.ccwindow.ccwindow_observer.ccwindow_private.ccwindow_private.hwindow_surface.ccwindow_tree_client.ccwindow_tree_client_delegate.ccwindow_tree_host_factory.cc
output_surface.hproperty_type_converters.hscoped_window_ptr.htests
BUILD.gnOWNERSproperty_type_converters_unittest.ccrun_all_unittests.cctest_window.htest_window_tree.cctest_window_tree.htest_window_tree_client_setup.cctest_window_tree_client_setup.hwindow_server_shelltest_base.ccwindow_server_shelltest_base.hwindow_server_test_base.ccwindow_server_test_base.hwindow_server_test_suite.ccwindow_server_test_suite.hwindow_tree_client_private.ccwindow_tree_client_private.hwindow_tree_client_unittest.ccwindow_unittest.cc
window.hwindow_manager_delegate.hwindow_observer.hwindow_property.hwindow_surface.hwindow_surface_client.hwindow_tracker.hwindow_tree_client.hwindow_tree_client_delegate.hwindow_tree_client_observer.hwindow_tree_host_factory.hinterfaces
BUILD.gnOWNERSaccelerator_registrar.mojomanimations.mojomchannel_handle.mojomclipboard.mojomcommand_buffer.mojomcursor.mojomdisplay.mojomevent_matcher.mojomgpu.mojom
gpu
gpu_memory_buffer.mojomgpu_service.mojominput_devices
mus_constants.mojomsurface.mojomuser_access_manager.mojomuser_activity_monitor.mojomwindow_manager.mojomwindow_manager_constants.mojomwindow_manager_window_tree_factory.mojomwindow_server_test.mojomwindow_tree.mojomwindow_tree_constants.mojomwindow_tree_host.mojomsurfaces
BUILD.gnDEPSOWNERSdirect_output_surface.ccdirect_output_surface.hdirect_output_surface_ozone.ccdirect_output_surface_ozone.hdisplay_compositor.ccdisplay_compositor.hozone_gpu_memory_buffer_manager.ccozone_gpu_memory_buffer_manager.hsurfaces_context_provider.ccsurfaces_context_provider.hsurfaces_context_provider_delegate.hsurfaces_state.ccsurfaces_state.h
test_wm
ws
BUILD.gnaccelerator.ccaccelerator.haccess_policy.haccess_policy_delegate.hanimation_runner.ccanimation_runner.hanimation_runner_observer.hanimation_runner_unittest.cccursor_unittest.ccdefault_access_policy.ccdefault_access_policy.hdisplay.ccdisplay.hdisplay_binding.ccdisplay_binding.hdisplay_manager.ccdisplay_manager.hdisplay_manager_delegate.hdisplay_unittest.ccevent_dispatcher.ccevent_dispatcher.hevent_dispatcher_delegate.hevent_dispatcher_unittest.ccevent_matcher.ccevent_matcher.hevent_matcher_unittest.ccfocus_controller.ccfocus_controller.hfocus_controller_delegate.hfocus_controller_observer.hfocus_controller_unittest.ccids.hmodal_window_controller.ccmodal_window_controller.hmus_ws_unittests_app_manifest.jsonoperation.ccoperation.hplatform_display.ccplatform_display.hplatform_display_delegate.hplatform_display_factory.hplatform_display_init_params.ccplatform_display_init_params.hplatform_screen.hplatform_screen_impl.ccplatform_screen_impl.hplatform_screen_impl_ozone.ccplatform_screen_impl_ozone.hscheduled_animation_group.ccscheduled_animation_group.hscheduled_animation_group_unittest.ccserver_window.ccserver_window.hserver_window_delegate.hserver_window_drawn_tracker.ccserver_window_drawn_tracker.hserver_window_drawn_tracker_observer.hserver_window_drawn_tracker_unittest.ccserver_window_observer.hserver_window_surface.ccserver_window_surface.hserver_window_surface_manager.ccserver_window_surface_manager.hserver_window_surface_manager_test_api.ccserver_window_surface_manager_test_api.hserver_window_tracker.htest_change_tracker.cctest_change_tracker.htest_server_window_delegate.cctest_server_window_delegate.htest_utils.cctest_utils.htouch_controller.cctouch_controller.htransient_windows_unittest.ccuser_activity_monitor.ccuser_activity_monitor.huser_activity_monitor_unittest.ccuser_display_manager.ccuser_display_manager.huser_display_manager_unittest.ccuser_id.huser_id_tracker.ccuser_id_tracker.huser_id_tracker_observer.hwindow_coordinate_conversions.ccwindow_coordinate_conversions.hwindow_coordinate_conversions_unittest.ccwindow_finder.ccwindow_finder.hwindow_finder_unittest.ccwindow_manager_access_policy.ccwindow_manager_access_policy.hwindow_manager_client_unittest.ccwindow_manager_display_root.ccwindow_manager_display_root.hwindow_manager_state.ccwindow_manager_state.hwindow_manager_state_unittest.ccwindow_manager_window_tree_factory.ccwindow_manager_window_tree_factory.hwindow_manager_window_tree_factory_set.ccwindow_manager_window_tree_factory_set.hwindow_manager_window_tree_factory_set_observer.hwindow_server.ccwindow_server.hwindow_server_delegate.ccwindow_server_delegate.hwindow_server_test_impl.ccwindow_server_test_impl.hwindow_tree.ccwindow_tree.hwindow_tree_binding.ccwindow_tree_binding.hwindow_tree_client_unittest.ccwindow_tree_factory.ccwindow_tree_factory.hwindow_tree_host_factory.ccwindow_tree_host_factory.hwindow_tree_unittest.cc
testing/buildbot
ui
app_list
display
events
mojo
views
mus
BUILD.gnDEPSclipboard_mus.hinput_method_mus.ccnative_widget_mus.ccnative_widget_mus.hnative_widget_mus_unittest.ccscreen_mus.hsurface_binding.ccsurface_binding.hsurface_context_factory.ccsurface_context_factory.hviews_mus_test_suite.ccwindow_manager_connection.ccwindow_manager_connection.hwindow_manager_constants_converters.hwindow_tree_host_mus.cc
@ -230,7 +230,7 @@ a3451b74e1aac0c538d7d6824bd714553eb0141e
|
||||
ccfc5401e32e24f29847cd91f643d03ed651b19a
|
||||
# Convert //components/proximity_auth from scoped_ptr to std::unique_ptr
|
||||
2f01269f405de0dfd12cb1dc56459c4492d65b8b
|
||||
# Convert //components/mus from scoped_ptr to std::unique_ptr
|
||||
# Convert //services/ui from scoped_ptr to std::unique_ptr
|
||||
c314381373dc794d3875428994ec7a74edda77e4
|
||||
# Convert //components/exo from scoped_ptr to std::unique_ptr
|
||||
31759da04512d5815aff6c30134e33856638889d
|
||||
|
||||
4
BUILD.gn
4
BUILD.gn
@ -703,12 +703,12 @@ group("gn_only") {
|
||||
|
||||
if (is_win || is_linux) {
|
||||
deps += [
|
||||
"//components/mus/demo",
|
||||
"//components/mus/ws:tests",
|
||||
"//mash:all",
|
||||
"//media/mojo/services:media_mojo_shell_unittests",
|
||||
"//mojo",
|
||||
"//services/navigation",
|
||||
"//services/ui/demo",
|
||||
"//services/ui/ws:tests",
|
||||
"//ui/views/mus:views_mus_interactive_ui_tests",
|
||||
"//ui/views/mus:views_mus_unittests",
|
||||
]
|
||||
|
||||
@ -585,7 +585,7 @@
|
||||
'filepath': 'mouse_lock',
|
||||
},
|
||||
'mus': {
|
||||
'filepath': 'components/mus/'\
|
||||
'filepath': 'services/ui/'\
|
||||
'|mojo/gpu/',
|
||||
},
|
||||
'nacl': {
|
||||
|
||||
@ -85,13 +85,13 @@ source_set("lib") {
|
||||
"//ash/mus/resources",
|
||||
"//ash/public/interfaces",
|
||||
"//base",
|
||||
"//components/mus/common:mus_common",
|
||||
"//components/mus/public/cpp",
|
||||
"//components/mus/public/interfaces",
|
||||
"//mash/session/public/interfaces",
|
||||
"//mojo/common:common_base",
|
||||
"//services/shell/public/cpp",
|
||||
"//services/tracing/public/cpp",
|
||||
"//services/ui/common:mus_common",
|
||||
"//services/ui/public/cpp",
|
||||
"//services/ui/public/interfaces",
|
||||
"//skia",
|
||||
"//ui/aura",
|
||||
"//ui/display/mojo",
|
||||
@ -123,7 +123,7 @@ mojo_native_application("mus") {
|
||||
# can't state that dependency here.
|
||||
data_deps = [
|
||||
":manifest",
|
||||
"//components/mus",
|
||||
"//services/ui",
|
||||
]
|
||||
|
||||
resources = [ "$root_out_dir/ash_mus_resources.pak" ]
|
||||
@ -179,13 +179,13 @@ source_set("unittests") {
|
||||
"//ash/public/interfaces",
|
||||
"//base",
|
||||
"//base/test:test_config",
|
||||
"//components/mus/common:mus_common",
|
||||
"//components/mus/public/cpp",
|
||||
"//components/mus/public/cpp/tests:test_support",
|
||||
"//components/mus/public/cpp/tests:unittest_support",
|
||||
"//components/mus/public/interfaces",
|
||||
"//mojo/public/cpp/system",
|
||||
"//services/shell/public/cpp:shell_test_support",
|
||||
"//services/ui/common:mus_common",
|
||||
"//services/ui/public/cpp",
|
||||
"//services/ui/public/cpp/tests:test_support",
|
||||
"//services/ui/public/cpp/tests:unittest_support",
|
||||
"//services/ui/public/interfaces",
|
||||
"//skia",
|
||||
"//testing/gtest",
|
||||
"//ui/aura",
|
||||
|
||||
@ -3,8 +3,8 @@ include_rules = [
|
||||
"+ash/common",
|
||||
"+ash/mus",
|
||||
"+ash/public",
|
||||
"+components/mus/common",
|
||||
"+components/mus/public",
|
||||
"+services/ui/common",
|
||||
"+services/ui/public",
|
||||
"+grit/ash_mus_resources.h",
|
||||
"+mash/session/public",
|
||||
"+mash/shelf/public",
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
#include "ash/mus/root_window_controller.h"
|
||||
#include "ash/mus/window_manager.h"
|
||||
#include "base/bind.h"
|
||||
#include "components/mus/public/cpp/window_manager_delegate.h"
|
||||
#include "services/ui/public/cpp/window_manager_delegate.h"
|
||||
|
||||
namespace ash {
|
||||
namespace mus {
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
#include "ash/mus/window_manager_observer.h"
|
||||
#include "base/callback.h"
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/binding_set.h"
|
||||
#include "mojo/public/cpp/bindings/strong_binding.h"
|
||||
#include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
|
||||
|
||||
namespace ash {
|
||||
namespace mus {
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
#include "base/bind.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/run_loop.h"
|
||||
#include "components/mus/common/event_matcher_util.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/binding.h"
|
||||
#include "services/shell/public/cpp/shell_test.h"
|
||||
#include "services/ui/common/event_matcher_util.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
|
||||
|
||||
using ::mus::mojom::AcceleratorHandler;
|
||||
using ::mus::mojom::AcceleratorHandlerPtr;
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
#include "base/bind.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/run_loop.h"
|
||||
#include "components/mus/public/interfaces/window_server_test.mojom.h"
|
||||
#include "services/shell/public/cpp/shell_test.h"
|
||||
#include "services/ui/public/interfaces/window_server_test.mojom.h"
|
||||
|
||||
namespace ash {
|
||||
namespace mus {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
#include "ash/common/wm_layout_manager.h"
|
||||
#include "ash/mus/bridge/wm_window_mus.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
|
||||
namespace ash {
|
||||
namespace mus {
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
#include <memory>
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/window_observer.h"
|
||||
#include "services/ui/public/cpp/window_observer.h"
|
||||
|
||||
namespace ash {
|
||||
class WmLayoutManager;
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
#include "ash/mus/bridge/wm_window_mus.h"
|
||||
#include "ash/mus/container_ids.h"
|
||||
#include "ash/mus/root_window_controller.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_property.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_property.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "ui/display/display.h"
|
||||
#include "ui/views/mus/native_widget_mus.h"
|
||||
#include "ui/views/widget/widget.h"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
#include "ash/mus/bridge/wm_window_mus.h"
|
||||
#include "ash/mus/shelf_layout_manager.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
|
||||
// TODO(sky): fully implement this http://crbug.com/612631 .
|
||||
#undef NOTIMPLEMENTED
|
||||
|
||||
@ -21,10 +21,10 @@
|
||||
#include "ash/mus/drag_window_resizer.h"
|
||||
#include "ash/mus/root_window_controller.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "components/mus/common/util.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "components/user_manager/user_info_impl.h"
|
||||
#include "services/ui/common/util.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
|
||||
namespace ash {
|
||||
namespace mus {
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
#include "ash/common/wm_shell.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/observer_list.h"
|
||||
#include "components/mus/public/cpp/window_tree_client_observer.h"
|
||||
#include "services/ui/public/cpp/window_tree_client_observer.h"
|
||||
|
||||
namespace mus {
|
||||
class WindowTreeClient;
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
#include "ash/mus/bridge/wm_root_window_controller_mus.h"
|
||||
#include "ash/mus/bridge/wm_shell_mus.h"
|
||||
#include "ash/mus/property_util.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_property.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "components/mus/public/interfaces/window_manager.mojom.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_property.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "services/ui/public/interfaces/window_manager.mojom.h"
|
||||
#include "ui/aura/mus/mus_util.h"
|
||||
#include "ui/base/hit_test.h"
|
||||
#include "ui/display/display.h"
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
#include "ash/common/wm_window.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/observer_list.h"
|
||||
#include "components/mus/public/cpp/window_observer.h"
|
||||
#include "services/ui/public/cpp/window_observer.h"
|
||||
|
||||
namespace views {
|
||||
class Widget;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#define ASH_MUS_DISCONNECTED_APP_HANDLER_H_
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/window_tracker.h"
|
||||
#include "services/ui/public/cpp/window_tracker.h"
|
||||
|
||||
namespace ash {
|
||||
namespace mus {
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
#include "ash/mus/frame/move_event_handler.h"
|
||||
|
||||
#include "ash/mus/bridge/wm_window_mus.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_manager_delegate.h"
|
||||
#include "components/mus/public/interfaces/cursor.mojom.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_manager_delegate.h"
|
||||
#include "services/ui/public/interfaces/cursor.mojom.h"
|
||||
#include "ui/aura/window.h"
|
||||
#include "ui/base/hit_test.h"
|
||||
#include "ui/events/event.h"
|
||||
|
||||
@ -13,9 +13,9 @@
|
||||
#include "ash/mus/frame/frame_border_hit_test_controller.h"
|
||||
#include "ash/mus/frame/header_painter.h"
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "grit/ash_mus_resources.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "ui/base/resource/resource_bundle.h"
|
||||
#include "ui/compositor/paint_recorder.h"
|
||||
#include "ui/gfx/canvas.h"
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
#define ASH_MUS_FRAME_NON_CLIENT_FRAME_VIEW_MASH_H_
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/window_observer.h"
|
||||
#include "components/mus/public/cpp/window_tree_client_observer.h"
|
||||
#include "services/ui/public/cpp/window_observer.h"
|
||||
#include "services/ui/public/cpp/window_tree_client_observer.h"
|
||||
#include "third_party/skia/include/core/SkColor.h"
|
||||
#include "ui/compositor/paint_cache.h"
|
||||
#include "ui/views/window/non_client_view.h"
|
||||
|
||||
@ -6,9 +6,9 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_property.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_property.h"
|
||||
|
||||
namespace ash {
|
||||
namespace mus {
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
#include <stdint.h>
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/window_observer.h"
|
||||
#include "services/ui/public/cpp/window_observer.h"
|
||||
|
||||
namespace ash {
|
||||
namespace mus {
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
#include <memory>
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/tests/test_window.h"
|
||||
#include "services/ui/public/cpp/tests/test_window.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -18,12 +18,12 @@
|
||||
#include "ash/mus/shadow.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_manager_delegate.h"
|
||||
#include "components/mus/public/cpp/window_property.h"
|
||||
#include "components/mus/public/interfaces/window_manager.mojom.h"
|
||||
#include "components/mus/public/interfaces/window_tree_host.mojom.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_manager_delegate.h"
|
||||
#include "services/ui/public/cpp/window_property.h"
|
||||
#include "services/ui/public/interfaces/window_manager.mojom.h"
|
||||
#include "services/ui/public/interfaces/window_tree_host.mojom.h"
|
||||
#include "ui/aura/layout_manager.h"
|
||||
#include "ui/aura/window.h"
|
||||
#include "ui/aura/window_tree_host.h"
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "base/strings/string16.h"
|
||||
#include "components/mus/public/cpp/window_observer.h"
|
||||
#include "services/ui/public/cpp/window_observer.h"
|
||||
#include "ui/views/widget/widget_delegate.h"
|
||||
|
||||
namespace gfx {
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
#include <stdint.h>
|
||||
|
||||
#include "ash/mus/shadow.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window_property.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window_property.h"
|
||||
#include "ui/gfx/geometry/rect.h"
|
||||
#include "ui/gfx/geometry/size.h"
|
||||
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
|
||||
#include "ash/public/interfaces/ash_window_type.mojom.h"
|
||||
#include "ash/public/interfaces/container.mojom.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/interfaces/window_manager_constants.mojom.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
|
||||
#include "ui/wm/public/window_types.h"
|
||||
|
||||
namespace gfx {
|
||||
|
||||
@ -32,15 +32,15 @@
|
||||
#include "base/bind.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "components/mus/common/switches.h"
|
||||
#include "components/mus/common/util.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_property.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "components/mus/public/cpp/window_tree_host_factory.h"
|
||||
#include "mojo/public/cpp/bindings/type_converter.h"
|
||||
#include "services/shell/public/cpp/connector.h"
|
||||
#include "services/ui/common/switches.h"
|
||||
#include "services/ui/common/util.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_property.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "services/ui/public/cpp/window_tree_host_factory.h"
|
||||
#include "ui/display/mojo/display_type_converters.h"
|
||||
|
||||
using ash::mojom::Container;
|
||||
|
||||
@ -10,8 +10,8 @@
|
||||
#include "ash/mus/disconnected_app_handler.h"
|
||||
#include "ash/mus/shelf_layout_manager_delegate.h"
|
||||
#include "ash/public/interfaces/container.mojom.h"
|
||||
#include "components/mus/public/cpp/window_observer.h"
|
||||
#include "components/mus/public/interfaces/window_manager_constants.mojom.h"
|
||||
#include "services/ui/public/cpp/window_observer.h"
|
||||
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
|
||||
#include "ui/display/display.h"
|
||||
|
||||
namespace shell {
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
#include "ash/mus/screenlock_layout.h"
|
||||
|
||||
#include "ash/mus/property_util.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_property.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_property.h"
|
||||
#include "ui/gfx/geometry/rect.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
#include <memory>
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/window_observer.h"
|
||||
#include "services/ui/public/cpp/window_observer.h"
|
||||
#include "ui/compositor/layer_animation_observer.h"
|
||||
#include "ui/gfx/geometry/rect.h"
|
||||
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
#include "ash/mus/property_util.h"
|
||||
#include "ash/mus/shadow.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
|
||||
namespace ash {
|
||||
namespace mus {
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
#define ASH_MUS_SHADOW_CONTROLLER_H_
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/window_observer.h"
|
||||
#include "components/mus/public/cpp/window_tree_client_observer.h"
|
||||
#include "services/ui/public/cpp/window_observer.h"
|
||||
#include "services/ui/public/cpp/window_tree_client_observer.h"
|
||||
|
||||
namespace mus {
|
||||
class WindowTreeClient;
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
#include "ash/mus/property_util.h"
|
||||
#include "ash/mus/shelf_layout_manager_delegate.h"
|
||||
#include "ash/public/interfaces/ash_window_type.mojom.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "ui/gfx/geometry/rect.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
#include "ash/mus/property_util.h"
|
||||
#include "ash/public/interfaces/ash_window_type.mojom.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "ui/gfx/geometry/rect.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
#include "ash/mus/window_manager_application.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/strings/string_split.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "ui/display/display.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -10,9 +10,9 @@
|
||||
#include "ash/mus/window_manager_application.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "base/message_loop/message_loop.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/tests/window_tree_client_private.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/tests/window_tree_client_private.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "ui/display/display.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
#include "ash/mus/window_manager_application.h"
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/tests/test_window_tree_client_setup.h"
|
||||
#include "services/ui/public/cpp/tests/test_window_tree_client_setup.h"
|
||||
|
||||
namespace base {
|
||||
class MessageLoop;
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
#include "ash/mus/property_util.h"
|
||||
#include "ash/mus/root_window_controller.h"
|
||||
#include "ash/public/interfaces/container.mojom.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_property.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "mojo/common/common_type_converters.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_property.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "ui/resources/grit/ui_resources.h"
|
||||
|
||||
MUS_DECLARE_WINDOW_PROPERTY_TYPE(uint32_t)
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
|
||||
#include "ash/public/interfaces/user_window_controller.mojom.h"
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/common/types.h"
|
||||
#include "components/mus/public/cpp/window_observer.h"
|
||||
#include "components/mus/public/cpp/window_tree_client_observer.h"
|
||||
#include "services/ui/common/types.h"
|
||||
#include "services/ui/public/cpp/window_observer.h"
|
||||
#include "services/ui/public/cpp/window_tree_client_observer.h"
|
||||
|
||||
namespace ash {
|
||||
namespace mus {
|
||||
|
||||
@ -18,14 +18,14 @@
|
||||
#include "ash/mus/shadow_controller.h"
|
||||
#include "ash/mus/window_manager_observer.h"
|
||||
#include "ash/public/interfaces/container.mojom.h"
|
||||
#include "components/mus/common/event_matcher_util.h"
|
||||
#include "components/mus/common/types.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_property.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "components/mus/public/interfaces/mus_constants.mojom.h"
|
||||
#include "components/mus/public/interfaces/window_manager.mojom.h"
|
||||
#include "services/ui/common/event_matcher_util.h"
|
||||
#include "services/ui/common/types.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_property.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "services/ui/public/interfaces/mus_constants.mojom.h"
|
||||
#include "services/ui/public/interfaces/window_manager.mojom.h"
|
||||
#include "ui/events/mojo/event.mojom.h"
|
||||
#include "ui/views/mus/screen_mus.h"
|
||||
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "base/observer_list.h"
|
||||
#include "components/mus/common/types.h"
|
||||
#include "components/mus/public/cpp/window_manager_delegate.h"
|
||||
#include "components/mus/public/cpp/window_observer.h"
|
||||
#include "components/mus/public/cpp/window_tree_client_delegate.h"
|
||||
#include "components/mus/public/interfaces/window_manager.mojom.h"
|
||||
#include "services/ui/common/types.h"
|
||||
#include "services/ui/public/cpp/window_manager_delegate.h"
|
||||
#include "services/ui/public/cpp/window_observer.h"
|
||||
#include "services/ui/public/cpp/window_tree_client_delegate.h"
|
||||
#include "services/ui/public/interfaces/window_manager.mojom.h"
|
||||
|
||||
namespace display {
|
||||
class Display;
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
#include "ash/mus/window_manager.h"
|
||||
#include "base/bind.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "components/mus/common/event_matcher_util.h"
|
||||
#include "components/mus/common/gpu_service.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "services/shell/public/cpp/connection.h"
|
||||
#include "services/shell/public/cpp/connector.h"
|
||||
#include "services/tracing/public/cpp/tracing_impl.h"
|
||||
#include "services/ui/common/event_matcher_util.h"
|
||||
#include "services/ui/common/gpu_service.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "ui/events/event.h"
|
||||
#include "ui/views/mus/aura_init.h"
|
||||
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
#include "ash/public/interfaces/shelf_layout.mojom.h"
|
||||
#include "ash/public/interfaces/user_window_controller.mojom.h"
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/common/types.h"
|
||||
#include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
|
||||
#include "mash/session/public/interfaces/session.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/binding.h"
|
||||
#include "mojo/public/cpp/bindings/binding_set.h"
|
||||
#include "services/shell/public/cpp/shell_client.h"
|
||||
#include "services/tracing/public/cpp/tracing_impl.h"
|
||||
#include "services/ui/common/types.h"
|
||||
#include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
|
||||
|
||||
namespace mus {
|
||||
class WindowTreeClient;
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
#include "base/bind.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/run_loop.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "components/mus/public/cpp/window_tree_client_delegate.h"
|
||||
#include "components/mus/public/interfaces/window_tree.mojom.h"
|
||||
#include "services/shell/public/cpp/shell_test.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "services/ui/public/cpp/window_tree_client_delegate.h"
|
||||
#include "services/ui/public/interfaces/window_tree.mojom.h"
|
||||
|
||||
namespace ash {
|
||||
namespace mus {
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
#include "ash/mus/bridge/wm_window_mus.h"
|
||||
#include "ash/mus/test/wm_test_base.h"
|
||||
#include "base/run_loop.h"
|
||||
#include "components/mus/public/cpp/tests/test_window.h"
|
||||
#include "services/ui/public/cpp/tests/test_window.h"
|
||||
#include "ui/display/display.h"
|
||||
|
||||
namespace ash {
|
||||
|
||||
@ -35,10 +35,6 @@ source_set("lib") {
|
||||
"//ash/public/interfaces",
|
||||
"//cc",
|
||||
"//cc/surfaces",
|
||||
"//components/mus/common:mus_common",
|
||||
"//components/mus/public/cpp",
|
||||
"//components/mus/public/cpp/input_devices",
|
||||
"//components/mus/public/interfaces",
|
||||
"//components/user_manager",
|
||||
"//components/wallpaper",
|
||||
"//device/bluetooth",
|
||||
@ -46,6 +42,10 @@ source_set("lib") {
|
||||
"//services/catalog/public/cpp",
|
||||
"//services/shell/public/cpp",
|
||||
"//services/tracing/public/cpp",
|
||||
"//services/ui/common:mus_common",
|
||||
"//services/ui/public/cpp",
|
||||
"//services/ui/public/cpp/input_devices",
|
||||
"//services/ui/public/interfaces",
|
||||
"//ui/app_list/presenter",
|
||||
"//ui/app_list/presenter:mojom",
|
||||
"//ui/aura",
|
||||
@ -94,7 +94,7 @@ mojo_native_application("sysui") {
|
||||
|
||||
data_deps = [
|
||||
":manifest",
|
||||
"//components/mus",
|
||||
"//services/ui",
|
||||
]
|
||||
|
||||
resources = [
|
||||
|
||||
@ -2,8 +2,8 @@ include_rules = [
|
||||
"+ash/host",
|
||||
"+ash/public/interfaces",
|
||||
"+cc",
|
||||
"+components/mus/common",
|
||||
"+components/mus/public",
|
||||
"+services/ui/common",
|
||||
"+services/ui/public",
|
||||
"+components/wallpaper",
|
||||
"+mash/shelf/public/interfaces",
|
||||
"+mojo/common",
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
#include "ash/shelf/shelf_widget.h"
|
||||
#include "ash/shell.h"
|
||||
#include "base/strings/string_util.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_property.h"
|
||||
#include "mojo/common/common_type_converters.h"
|
||||
#include "services/shell/public/cpp/connector.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_property.h"
|
||||
#include "ui/aura/mus/mus_util.h"
|
||||
#include "ui/base/resource/resource_bundle.h"
|
||||
#include "ui/gfx/image/image_skia.h"
|
||||
|
||||
@ -30,11 +30,11 @@
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/path_service.h"
|
||||
#include "base/threading/sequenced_worker_pool.h"
|
||||
#include "components/mus/common/gpu_service.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/interfaces/input_devices/input_device_server.mojom.h"
|
||||
#include "services/catalog/public/cpp/resource_loader.h"
|
||||
#include "services/shell/public/cpp/connector.h"
|
||||
#include "services/ui/common/gpu_service.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/interfaces/input_devices/input_device_server.mojom.h"
|
||||
#include "ui/aura/env.h"
|
||||
#include "ui/base/resource/resource_bundle.h"
|
||||
#include "ui/base/ui_base_paths.h"
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
#include "ash/sysui/public/interfaces/wallpaper.mojom.h"
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/input_devices/input_device_client.h"
|
||||
#include "mash/shelf/public/interfaces/shelf.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/binding_set.h"
|
||||
#include "services/shell/public/cpp/shell_client.h"
|
||||
#include "services/tracing/public/cpp/tracing_impl.h"
|
||||
#include "services/ui/public/cpp/input_devices/input_device_client.h"
|
||||
|
||||
namespace ash {
|
||||
namespace sysui {
|
||||
|
||||
@ -14,7 +14,6 @@ source_set("mash") {
|
||||
"//ash/resources",
|
||||
"//ash/sysui:lib",
|
||||
"//base:i18n",
|
||||
"//components/mus:lib",
|
||||
"//content/public/common",
|
||||
"//mash/app_driver:lib",
|
||||
"//mash/quick_launch:lib",
|
||||
@ -27,6 +26,7 @@ source_set("mash") {
|
||||
"//services/shell/runner/common",
|
||||
"//services/shell/runner/host:child_process_base",
|
||||
"//services/shell/runner/host:lib",
|
||||
"//services/ui:lib",
|
||||
"//url",
|
||||
]
|
||||
data_deps = [
|
||||
@ -45,11 +45,11 @@ mojo_application_manifest("manifest") {
|
||||
deps = [
|
||||
"//ash/mus:manifest",
|
||||
"//ash/sysui:manifest",
|
||||
"//components/mus:manifest",
|
||||
"//mash/app_driver:manifest",
|
||||
"//mash/quick_launch:manifest",
|
||||
"//mash/session:manifest",
|
||||
"//mash/task_viewer:manifest",
|
||||
"//services/ui:manifest",
|
||||
]
|
||||
packaged_applications = [
|
||||
"app_driver",
|
||||
|
||||
@ -6,7 +6,7 @@ include_rules = [
|
||||
"-chrome",
|
||||
"+chrome/app/mash",
|
||||
"+components/font_service",
|
||||
"+components/mus",
|
||||
"+services/ui",
|
||||
"+mash",
|
||||
"+services/shell",
|
||||
]
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "base/message_loop/message_loop.h"
|
||||
#include "base/process/launch.h"
|
||||
#include "components/mus/mus_app.h"
|
||||
#include "content/public/common/content_switches.h"
|
||||
#include "mash/app_driver/app_driver.h"
|
||||
#include "mash/quick_launch/quick_launch_application.h"
|
||||
@ -31,6 +30,7 @@
|
||||
#include "services/shell/public/interfaces/shell_client_factory.mojom.h"
|
||||
#include "services/shell/runner/common/switches.h"
|
||||
#include "services/shell/runner/host/child_process_base.h"
|
||||
#include "services/ui/mus_app.h"
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
#include "components/font_service/font_service_app.h"
|
||||
|
||||
@ -618,9 +618,9 @@ split_static_library("browser") {
|
||||
"ui/views/frame/browser_non_client_frame_view_mus.h",
|
||||
]
|
||||
deps += [
|
||||
"//components/mus/public/cpp",
|
||||
"//components/mus/public/cpp/input_devices",
|
||||
"//content/public/common",
|
||||
"//services/ui/public/cpp",
|
||||
"//services/ui/public/cpp/input_devices",
|
||||
"//ui/aura",
|
||||
"//ui/compositor",
|
||||
"//ui/views/mus",
|
||||
|
||||
@ -39,6 +39,7 @@ include_rules = [
|
||||
"+mojo/converters",
|
||||
"+mojo/runner/child",
|
||||
"+services/shell/public/cpp",
|
||||
"+services/ui/public",
|
||||
"+policy", # For generated headers and source
|
||||
"+ppapi/c", # For various types.
|
||||
"+ppapi/host",
|
||||
|
||||
@ -109,7 +109,7 @@
|
||||
|
||||
#if defined(MOJO_SHELL_CLIENT)
|
||||
#include "ash/public/interfaces/container.mojom.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#endif
|
||||
|
||||
namespace {
|
||||
|
||||
@ -321,8 +321,8 @@ split_static_library("ui") {
|
||||
"//chrome")
|
||||
if (use_aura) {
|
||||
deps += [
|
||||
"//components/mus/public/cpp",
|
||||
"//components/mus/public/interfaces",
|
||||
"//services/ui/public/cpp",
|
||||
"//services/ui/public/interfaces",
|
||||
]
|
||||
}
|
||||
if (enable_extensions) {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
include_rules = [
|
||||
"+chrome/browser/ui/views",
|
||||
"+components/constrained_window",
|
||||
"+components/mus/public/cpp",
|
||||
"+services/ui/public/cpp",
|
||||
"+components/user_manager",
|
||||
"+content/app/resources/grit/content_resources.h",
|
||||
]
|
||||
|
||||
@ -29,9 +29,9 @@
|
||||
#include "ui/views/widget/widget.h"
|
||||
|
||||
#if defined(MOJO_SHELL_CLIENT)
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/interfaces/window_manager.mojom.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/interfaces/window_manager.mojom.h"
|
||||
#include "ui/aura/mus/mus_util.h"
|
||||
#include "ui/gfx/skia_util.h"
|
||||
#endif
|
||||
|
||||
@ -15,11 +15,11 @@
|
||||
#endif
|
||||
|
||||
#if defined(USE_AURA) && defined(MOJO_SHELL_CLIENT)
|
||||
#include "components/mus/public/cpp/input_devices/input_device_client.h"
|
||||
#include "components/mus/public/interfaces/input_devices/input_device_server.mojom.h"
|
||||
#include "content/public/common/mojo_shell_connection.h"
|
||||
#include "services/shell/public/cpp/connector.h"
|
||||
#include "services/shell/runner/common/client_util.h"
|
||||
#include "services/ui/public/cpp/input_devices/input_device_client.h"
|
||||
#include "services/ui/public/interfaces/input_devices/input_device_server.mojom.h"
|
||||
#include "ui/views/mus/window_manager_connection.h"
|
||||
#endif
|
||||
|
||||
|
||||
@ -9,9 +9,9 @@
|
||||
#include "chrome/browser/ui/views/frame/browser_frame.h"
|
||||
#include "chrome/browser/ui/views/frame/browser_view.h"
|
||||
#include "chrome/common/extensions/extension_constants.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/interfaces/window_tree.mojom.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/interfaces/window_tree.mojom.h"
|
||||
#include "ui/views/mus/window_manager_connection.h"
|
||||
#include "ui/views/mus/window_manager_frame_values.h"
|
||||
|
||||
|
||||
@ -23,11 +23,11 @@
|
||||
#include "chrome/browser/ui/views/tab_icon_view.h"
|
||||
#include "chrome/browser/ui/views/tabs/tab_strip.h"
|
||||
#include "chrome/browser/web_applications/web_app.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/signin/core/common/profile_management_switches.h"
|
||||
#include "content/public/browser/web_contents.h"
|
||||
#include "extensions/browser/extension_registry.h"
|
||||
#include "grit/theme_resources.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "ui/accessibility/ax_view_state.h"
|
||||
#include "ui/aura/client/aura_constants.h"
|
||||
#include "ui/aura/window.h"
|
||||
|
||||
@ -44,8 +44,8 @@
|
||||
#endif
|
||||
|
||||
#if defined(MOJO_SHELL_CLIENT)
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/interfaces/window_manager.mojom.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/interfaces/window_manager.mojom.h"
|
||||
#endif
|
||||
|
||||
// The alpha and color of the bubble's shadow.
|
||||
|
||||
@ -15,7 +15,7 @@ component("bitmap_uploader") {
|
||||
|
||||
deps = [
|
||||
"//base",
|
||||
"//components/mus/public/cpp",
|
||||
"//components/mus/public/interfaces",
|
||||
"//services/ui/public/cpp",
|
||||
"//services/ui/public/interfaces",
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
include_rules = [
|
||||
"+cc/ipc",
|
||||
"+cc/quads",
|
||||
"+components/mus/public",
|
||||
"+gpu/GLES2",
|
||||
"+mojo/common",
|
||||
"+mojo/public",
|
||||
"+services/ui/public",
|
||||
"+ui/gfx/geometry",
|
||||
]
|
||||
|
||||
@ -13,9 +13,9 @@
|
||||
#include "cc/quads/render_pass.h"
|
||||
#include "cc/quads/solid_color_draw_quad.h"
|
||||
#include "cc/quads/texture_draw_quad.h"
|
||||
#include "components/mus/public/cpp/gles2_context.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_surface.h"
|
||||
#include "services/ui/public/cpp/gles2_context.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_surface.h"
|
||||
|
||||
namespace bitmap_uploader {
|
||||
namespace {
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
#include "base/containers/hash_tables.h"
|
||||
#include "base/macros.h"
|
||||
#include "components/bitmap_uploader/bitmap_uploader_export.h"
|
||||
#include "components/mus/public/cpp/window_surface.h"
|
||||
#include "components/mus/public/cpp/window_surface_client.h"
|
||||
#include "components/mus/public/interfaces/surface.mojom.h"
|
||||
#include "gpu/GLES2/gl2chromium.h"
|
||||
#include "gpu/GLES2/gl2extchromium.h"
|
||||
#include "services/ui/public/cpp/window_surface.h"
|
||||
#include "services/ui/public/cpp/window_surface_client.h"
|
||||
#include "services/ui/public/interfaces/surface.mojom.h"
|
||||
|
||||
namespace mus {
|
||||
class GLES2Context;
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
ben@chromium.org
|
||||
erg@chromium.org
|
||||
msw@chromium.org
|
||||
sky@chromium.org
|
||||
@ -390,9 +390,9 @@ source_set("browser") {
|
||||
if (use_aura) {
|
||||
deps += [
|
||||
"//components/bitmap_uploader",
|
||||
"//components/mus/common:mus_common",
|
||||
"//components/mus/public/cpp",
|
||||
"//components/mus/public/interfaces",
|
||||
"//services/ui/common:mus_common",
|
||||
"//services/ui/public/cpp",
|
||||
"//services/ui/public/interfaces",
|
||||
"//ui/aura",
|
||||
"//ui/aura_extra",
|
||||
"//ui/strings",
|
||||
|
||||
@ -5,9 +5,6 @@ include_rules = [
|
||||
"+components/leveldb",
|
||||
"+components/link_header_util",
|
||||
"+components/mime_util",
|
||||
"+components/mus/common",
|
||||
"+components/mus/public/interfaces",
|
||||
"+components/mus/public",
|
||||
"+components/network_session_configurator/switches.h",
|
||||
"+components/profile_service",
|
||||
"+components/scheduler/common",
|
||||
|
||||
@ -193,7 +193,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
|
||||
#include "components/mus/common/gpu_service.h" // nogncheck
|
||||
#include "services/ui/common/gpu_service.h" // nogncheck
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
include_rules = [
|
||||
"+cc/switches.h", # For cc command line switches.
|
||||
"+components/mus/public",
|
||||
"+components/display_compositor",
|
||||
"+services/ui/public",
|
||||
"+third_party/zlib",
|
||||
"+third_party/libyuv",
|
||||
|
||||
@ -22,7 +22,7 @@ specific_include_rules = {
|
||||
"+content/public/browser/web_contents_view.h",
|
||||
],
|
||||
"render_process_host_impl\.cc": [
|
||||
"+components/mus/common/switches.h",
|
||||
"+services/ui/common/switches.h",
|
||||
"+content/browser/frame_host/render_frame_message_filter.h",
|
||||
],
|
||||
"render_widget_host_view_mac\.mm": [
|
||||
|
||||
@ -233,7 +233,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
|
||||
#include "components/mus/common/switches.h" // nogncheck
|
||||
#include "services/ui/common/switches.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN)
|
||||
|
||||
@ -7,17 +7,17 @@
|
||||
#include <utility>
|
||||
|
||||
#include "build/build_config.h"
|
||||
#include "components/mus/public/cpp/property_type_converters.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_property.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "components/mus/public/interfaces/window_manager_constants.mojom.h"
|
||||
#include "content/browser/renderer_host/render_process_host_impl.h"
|
||||
#include "content/browser/renderer_host/render_widget_host_impl.h"
|
||||
#include "content/common/render_widget_window_tree_client_factory.mojom.h"
|
||||
#include "content/common/text_input_state.h"
|
||||
#include "content/public/common/mojo_shell_connection.h"
|
||||
#include "services/shell/public/cpp/connector.h"
|
||||
#include "services/ui/public/cpp/property_type_converters.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_property.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
|
||||
#include "ui/aura/client/screen_position_client.h"
|
||||
#include "ui/aura/window.h"
|
||||
#include "ui/base/hit_test.h"
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "build/build_config.h"
|
||||
#include "components/mus/public/cpp/input_event_handler.h"
|
||||
#include "components/mus/public/cpp/scoped_window_ptr.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "content/browser/renderer_host/render_widget_host_view_base.h"
|
||||
#include "content/public/browser/render_process_host_observer.h"
|
||||
#include "services/ui/public/cpp/input_event_handler.h"
|
||||
#include "services/ui/public/cpp/scoped_window_ptr.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
|
||||
namespace content {
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
#include "content/browser/web_contents/web_contents_view_mus.h"
|
||||
|
||||
#include "build/build_config.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "content/browser/frame_host/interstitial_page_impl.h"
|
||||
#include "content/browser/renderer_host/render_widget_host_view_mus.h"
|
||||
#include "content/browser/web_contents/web_contents_impl.h"
|
||||
#include "content/public/browser/render_widget_host_view.h"
|
||||
#include "content/public/browser/web_contents_view_delegate.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "third_party/WebKit/public/platform/WebDragOperation.h"
|
||||
#include "ui/aura/client/window_tree_client.h"
|
||||
#include "ui/aura/window.h"
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "build/build_config.h"
|
||||
#include "components/mus/public/cpp/scoped_window_ptr.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "content/browser/renderer_host/render_view_host_delegate_view.h"
|
||||
#include "content/browser/web_contents/web_contents_view.h"
|
||||
#include "content/common/content_export.h"
|
||||
#include "content/common/drag_event_source_info.h"
|
||||
#include "services/ui/public/cpp/scoped_window_ptr.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "ui/aura/window_delegate.h"
|
||||
|
||||
namespace content {
|
||||
|
||||
@ -42,7 +42,6 @@ source_set("common") {
|
||||
"//cc",
|
||||
"//cc/ipc",
|
||||
"//cc/surfaces",
|
||||
"//components/mus/public/interfaces",
|
||||
"//components/tracing",
|
||||
"//components/tracing:startup_tracing",
|
||||
"//content:resources",
|
||||
@ -74,6 +73,7 @@ source_set("common") {
|
||||
"//services/shell/public/cpp",
|
||||
"//services/shell/public/interfaces",
|
||||
"//services/shell/runner/common",
|
||||
"//services/ui/public/interfaces",
|
||||
"//skia",
|
||||
"//storage/common",
|
||||
"//third_party/WebKit/public:blink_minimal",
|
||||
@ -252,8 +252,8 @@ mojom("mojo_bindings") {
|
||||
|
||||
public_deps = [
|
||||
"//components/leveldb/public/interfaces",
|
||||
"//components/mus/public/interfaces",
|
||||
"//services/shell/public/interfaces",
|
||||
"//services/ui/public/interfaces",
|
||||
"//skia/public/interfaces",
|
||||
"//third_party/WebKit/public:mojo_bindings",
|
||||
"//ui/gfx/geometry/mojo",
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
module content.mojom;
|
||||
|
||||
import "components/mus/public/interfaces/window_tree.mojom";
|
||||
import "services/ui/public/interfaces/window_tree.mojom";
|
||||
|
||||
interface RenderWidgetWindowTreeClientFactory {
|
||||
CreateWindowTreeClientForRenderWidget(
|
||||
|
||||
@ -100,7 +100,7 @@ source_set("renderer") {
|
||||
if (use_aura) {
|
||||
public_deps += [ "//content/renderer/mus" ]
|
||||
allow_circular_includes_from += [ "//content/renderer/mus" ]
|
||||
deps += [ "//components/mus/common:mus_common" ]
|
||||
deps += [ "//services/ui/common:mus_common" ]
|
||||
}
|
||||
|
||||
if (use_external_popup_menu) {
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
include_rules = [
|
||||
# Allow inclusion of specific components that we depend on.
|
||||
# See comment in content/DEPS for which components are allowed.
|
||||
"+components/mus/common",
|
||||
"+components/mus/public",
|
||||
# Allow inclusion of specific components that we depend on. We may only
|
||||
# depend on components which we share with the mojo html_viewer.
|
||||
"+components/scheduler",
|
||||
"+components/url_formatter",
|
||||
|
||||
|
||||
@ -20,13 +20,13 @@ source_set("mus") {
|
||||
deps = [
|
||||
"//base",
|
||||
"//cc",
|
||||
"//components/mus/public/cpp",
|
||||
"//components/mus/public/interfaces",
|
||||
"//content/common",
|
||||
"//content/public/common:common_sources",
|
||||
"//mojo/common",
|
||||
"//mojo/converters/blink",
|
||||
"//services/shell/public/cpp",
|
||||
"//services/ui/public/cpp",
|
||||
"//services/ui/public/interfaces",
|
||||
"//third_party/WebKit/public:blink",
|
||||
"//ui/events:events",
|
||||
"//ui/events:events_base",
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
#include "base/bind.h"
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/input_event_handler.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "components/mus/public/cpp/window_tree_client_delegate.h"
|
||||
#include "content/common/content_export.h"
|
||||
#include "services/ui/public/cpp/input_event_handler.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "services/ui/public/cpp/window_tree_client_delegate.h"
|
||||
#include "third_party/WebKit/public/web/WebInputEvent.h"
|
||||
|
||||
namespace content {
|
||||
|
||||
@ -10,7 +10,6 @@
|
||||
#include "base/memory/ref_counted.h"
|
||||
#include "base/test/test_simple_task_runner.h"
|
||||
#include "base/time/time.h"
|
||||
#include "components/mus/public/cpp/tests/test_window.h"
|
||||
#include "content/common/input/did_overscroll_params.h"
|
||||
#include "content/common/input/input_event_ack.h"
|
||||
#include "content/common/input/input_event_ack_state.h"
|
||||
@ -23,6 +22,7 @@
|
||||
#include "content/test/fake_compositor_dependencies.h"
|
||||
#include "content/test/fake_renderer_scheduler.h"
|
||||
#include "mojo/public/cpp/bindings/interface_request.h"
|
||||
#include "services/ui/public/cpp/tests/test_window.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
#include "ui/events/event_utils.h"
|
||||
#include "ui/events/mojo/event.mojom.h"
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
#include "base/lazy_instance.h"
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/context_provider.h"
|
||||
#include "components/mus/public/cpp/output_surface.h"
|
||||
#include "components/mus/public/interfaces/command_buffer.mojom.h"
|
||||
#include "components/mus/public/interfaces/surface.mojom.h"
|
||||
#include "components/mus/public/interfaces/window_tree.mojom.h"
|
||||
#include "content/public/common/mojo_shell_connection.h"
|
||||
#include "content/renderer/mus/compositor_mus_connection.h"
|
||||
#include "content/renderer/render_thread_impl.h"
|
||||
#include "content/renderer/render_view_impl.h"
|
||||
#include "services/shell/public/cpp/connector.h"
|
||||
#include "services/ui/public/cpp/context_provider.h"
|
||||
#include "services/ui/public/cpp/output_surface.h"
|
||||
#include "services/ui/public/interfaces/command_buffer.mojom.h"
|
||||
#include "services/ui/public/interfaces/surface.mojom.h"
|
||||
#include "services/ui/public/interfaces/window_tree.mojom.h"
|
||||
|
||||
namespace content {
|
||||
|
||||
|
||||
@ -8,10 +8,10 @@
|
||||
#include "base/macros.h"
|
||||
#include "base/threading/thread_checker.h"
|
||||
#include "cc/output/output_surface.h"
|
||||
#include "components/mus/public/cpp/window_surface.h"
|
||||
#include "content/common/content_export.h"
|
||||
#include "content/renderer/input/render_widget_input_handler_delegate.h"
|
||||
#include "content/renderer/mus/compositor_mus_connection.h"
|
||||
#include "services/ui/public/cpp/window_surface.h"
|
||||
|
||||
namespace content {
|
||||
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
#include "base/logging.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "components/mus/public/interfaces/window_tree.mojom.h"
|
||||
#include "content/common/render_widget_window_tree_client_factory.mojom.h"
|
||||
#include "content/public/common/mojo_shell_connection.h"
|
||||
#include "content/renderer/mus/render_widget_mus_connection.h"
|
||||
@ -17,6 +16,7 @@
|
||||
#include "services/shell/public/cpp/connection.h"
|
||||
#include "services/shell/public/cpp/interface_factory.h"
|
||||
#include "services/shell/public/cpp/shell_client.h"
|
||||
#include "services/ui/public/interfaces/window_tree.mojom.h"
|
||||
#include "url/gurl.h"
|
||||
|
||||
namespace content {
|
||||
|
||||
@ -198,10 +198,10 @@
|
||||
#endif
|
||||
|
||||
#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
|
||||
#include "components/mus/common/gpu_service.h"
|
||||
#include "content/public/common/mojo_shell_connection.h"
|
||||
#include "content/renderer/mus/render_widget_mus_connection.h"
|
||||
#include "content/renderer/mus/render_widget_window_tree_client_factory.h"
|
||||
#include "services/ui/common/gpu_service.h"
|
||||
#endif
|
||||
|
||||
#if defined(ENABLE_IPC_FUZZER)
|
||||
|
||||
@ -835,7 +835,7 @@ test("content_unittests") {
|
||||
|
||||
if (use_aura) {
|
||||
deps += [
|
||||
"//components/mus/public/cpp/tests:unittest_support",
|
||||
"//services/ui/public/cpp/tests:unittest_support",
|
||||
"//ui/aura:test_support",
|
||||
"//ui/aura_extra",
|
||||
"//ui/wm",
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
include_rules = [
|
||||
"+ash/public/interfaces",
|
||||
"+components/mus/common",
|
||||
"+components/mus/public",
|
||||
"+components/prefs",
|
||||
"+mojo/common",
|
||||
"+mojo/converters",
|
||||
@ -9,6 +7,8 @@ include_rules = [
|
||||
"+services/catalog/public",
|
||||
"+services/shell",
|
||||
"+services/tracing/public",
|
||||
"+services/ui/common",
|
||||
"+services/ui/public",
|
||||
"+third_party/skia/include",
|
||||
"+ui",
|
||||
]
|
||||
|
||||
@ -15,19 +15,19 @@ source_set("lib") {
|
||||
]
|
||||
|
||||
deps = [
|
||||
"//components/mus/common:mus_common",
|
||||
"//mash/public/interfaces",
|
||||
"//services/ui/common:mus_common",
|
||||
]
|
||||
|
||||
public_deps = [
|
||||
"//base",
|
||||
"//components/mus/public/interfaces",
|
||||
"//services/catalog/public/interfaces",
|
||||
"//services/shell/public/cpp:sources",
|
||||
"//services/ui/public/interfaces",
|
||||
]
|
||||
|
||||
data_deps = [
|
||||
"//components/mus",
|
||||
"//services/ui",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@ -8,10 +8,10 @@
|
||||
|
||||
#include "base/bind.h"
|
||||
#include "base/message_loop/message_loop.h"
|
||||
#include "components/mus/common/event_matcher_util.h"
|
||||
#include "mash/public/interfaces/launchable.mojom.h"
|
||||
#include "services/shell/public/cpp/connection.h"
|
||||
#include "services/shell/public/cpp/connector.h"
|
||||
#include "services/ui/common/event_matcher_util.h"
|
||||
|
||||
using mash::mojom::LaunchablePtr;
|
||||
using mash::mojom::LaunchMode;
|
||||
|
||||
@ -12,10 +12,10 @@
|
||||
#include "base/callback.h"
|
||||
#include "base/macros.h"
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
|
||||
#include "mojo/public/cpp/bindings/binding.h"
|
||||
#include "services/catalog/public/interfaces/catalog.mojom.h"
|
||||
#include "services/shell/public/cpp/shell_client.h"
|
||||
#include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
|
||||
|
||||
namespace mash {
|
||||
namespace app_driver {
|
||||
|
||||
@ -19,7 +19,6 @@ source_set("lib") {
|
||||
|
||||
deps = [
|
||||
"//base",
|
||||
"//components/mus/public/cpp",
|
||||
"//mash/public/interfaces",
|
||||
"//mojo/public/cpp/bindings",
|
||||
"//services/catalog/public/interfaces",
|
||||
@ -28,6 +27,7 @@ source_set("lib") {
|
||||
"//services/shell/public/cpp",
|
||||
"//services/shell/public/interfaces",
|
||||
"//services/tracing/public/cpp",
|
||||
"//services/ui/public/cpp",
|
||||
"//ui/gfx/geometry/mojo",
|
||||
"//ui/native_theme",
|
||||
"//ui/views",
|
||||
@ -56,7 +56,7 @@ mojo_native_application("browser") {
|
||||
|
||||
data_deps = [
|
||||
":manifest",
|
||||
"//components/mus",
|
||||
"//services/ui",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@ -13,8 +13,6 @@
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "base/threading/thread_task_runner_handle.h"
|
||||
#include "base/timer/timer.h"
|
||||
#include "components/mus/public/cpp/window.h"
|
||||
#include "components/mus/public/cpp/window_tree_client.h"
|
||||
#include "mash/browser/debug_view.h"
|
||||
#include "mash/public/interfaces/launchable.mojom.h"
|
||||
#include "mojo/public/c/system/main.h"
|
||||
@ -26,6 +24,8 @@
|
||||
#include "services/shell/public/cpp/connector.h"
|
||||
#include "services/shell/public/cpp/shell_client.h"
|
||||
#include "services/tracing/public/cpp/tracing_impl.h"
|
||||
#include "services/ui/public/cpp/window.h"
|
||||
#include "services/ui/public/cpp/window_tree_client.h"
|
||||
#include "ui/aura/mus/mus_util.h"
|
||||
#include "ui/base/models/menu_model.h"
|
||||
#include "ui/gfx/canvas.h"
|
||||
|
||||
@ -28,7 +28,7 @@ source_set("lib") {
|
||||
]
|
||||
|
||||
data_deps = [
|
||||
"//components/mus",
|
||||
"//services/ui",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
#include <memory>
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "components/mus/public/cpp/window_tree_client_delegate.h"
|
||||
#include "components/mus/public/interfaces/window_manager.mojom.h"
|
||||
#include "services/ui/public/cpp/window_tree_client_delegate.h"
|
||||
#include "services/ui/public/interfaces/window_manager.mojom.h"
|
||||
#include "ui/views/mus/aura_init.h"
|
||||
#include "ui/views/views_delegate.h"
|
||||
|
||||
|
||||
@ -19,12 +19,12 @@ mojo_native_application("views_examples") {
|
||||
|
||||
deps = [
|
||||
"//base",
|
||||
"//components/mus/public/interfaces",
|
||||
"//mash/public/interfaces",
|
||||
"//mojo/public/cpp/bindings",
|
||||
"//services/shell/public/cpp",
|
||||
"//services/shell/public/cpp:sources",
|
||||
"//services/tracing/public/cpp",
|
||||
"//services/ui/public/interfaces",
|
||||
"//skia",
|
||||
"//ui/gfx",
|
||||
"//ui/gfx/geometry",
|
||||
@ -38,7 +38,7 @@ mojo_native_application("views_examples") {
|
||||
|
||||
data_deps = [
|
||||
":manifest",
|
||||
"//components/mus",
|
||||
"//services/ui",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user