chromium/src
0
Fork 0
Code Activity

Move mojo\shell to services\shell

Browse Source 
TBR=jam@chromium.org,tsepez@chromium.org
NOTRY=true
BUG=
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation

Review URL: https://codereview.chromium.org/1877753003

Cr-Commit-Position: refs/heads/master@{#386836}
This commit is contained in:
ben
2016-04-12 15:38:22 -07:00
committed by Commit bot
parent 75afcf7681
commit f709a309fc
440 changed files with 1125 additions and 1115 deletions
BUILD.gn
ash/mus
BUILD.gnDEPSkeyboard_ui_mus.ccmain.ccshelf_delegate_mus.ccsysui_application.h
chrome
app
mash
BUILD.gnDEPSmash_runner.ccmash_runner.h
browser
BUILD.gnDEPSchrome_content_browser_client.cc
chromeos
BUILD.gnchrome_interface_factory.ccchrome_interface_factory.h
ui
ash
launcher
chrome_mash_shelf_controller.cc
test
BUILD.gnDEPS
base
mash_browser_tests_main.ccmojo_test_connector.ccmojo_test_connector.h
chromecast/browser
DEPS
media
BUILD.gncast_mojo_media_application.cccast_mojo_media_application.h
components
bitmap_uploader
BUILD.gnDEPSbitmap_uploader.cc
filesystem
BUILD.gnDEPSfile_system_app.ccfile_system_app.hfile_system_impl.ccfiles_test_base.ccfiles_test_base.hfilesystem.gypmain.cc
public
cpp
prefs
BUILD.gnpref_service_factory.cc
font_service
BUILD.gnDEPSfont_service_app.ccfont_service_app.hmain.cc
public
cpp
BUILD.gnfont_loader.cc
leveldb
BUILD.gnDEPSleveldb_app.ccleveldb_app.hleveldb_service_unittest.ccmain.cc
public
cpp
BUILD.gn
remote_iterator_unittest.cc
mus
BUILD.gnDEPS
demo
BUILD.gnmain.ccmus_demo.h
gles2
BUILD.gn
main.ccmus_app.ccmus_app.h
public
cpp
BUILD.gn
lib
window_tree_client_impl.ccwindow_tree_host_factory.cc
tests
BUILD.gnwindow_server_shelltest_base.ccwindow_server_shelltest_base.hwindow_server_test_base.ccwindow_server_test_base.h
window.hwindow_tree_delegate.h
surfaces
BUILD.gnDEPS
ws
BUILD.gndisplay.ccdisplay_binding.ccplatform_display.cctest_utils.ccuser_id_tracker.ccwindow_manager_state.ccwindow_manager_state_unittest.ccwindow_server.ccwindow_tree_client_unittest.ccwindow_tree_unittest.cc
profile_service
BUILD.gnDEPSprofile_app.ccprofile_app.hprofile_service.gypprofile_service_impl.ccprofile_service_impl.h
resource_provider
BUILD.gnDEPSmain.cc
public
cpp
BUILD.gnresource_loader.cc
interfaces
BUILD.gn
resource_provider_app.ccresource_provider_app.hresource_provider_test_app.ccresource_provider_unittest.cc
content
app
BUILD.gn
browser
BUILD.gnDEPSbrowser_main_loop.cc
frame_host
frame_mojo_shell.h
mojo
mojo_app_connection_impl.hmojo_child_connection.ccmojo_child_connection.hmojo_shell_context.ccmojo_shell_context.h
renderer_host
render_process_host_impl.ccrender_widget_host_view_mus.cc
child
BUILD.gnDEPSprocess_control_impl.h
common
BUILD.gnapplication_setup.mojom
mojo
DEPScurrent_thread_loader.hmojo_shell_connection_impl.ccmojo_shell_connection_impl.hservice_registry_impl.hstatic_loader.ccstatic_loader.h
process_control.mojomrender_frame_setup.mojom
service_worker
embedded_worker_setup.mojom
gpu
BUILD.gnDEPS
ppapi_plugin
BUILD.gn
public
DEPS
browser
browser_context.h
common
mojo_shell_connection.h
test
DEPStest_mojo_app.cctest_mojo_app.h
renderer
BUILD.gnDEPS
media
media_interface_provider.ccmedia_interface_provider.h
mus
BUILD.gnrender_widget_mus_connection.ccrender_widget_window_tree_client_factory.cc
render_frame_impl.h
service_worker
service_worker_context_client.h
usb
web_usb_device_impl.ccweb_usb_device_impl.h
shell
utility
DEPS
test
BUILD.gn
data
web_ui_mojo_shell_test.js
utility
BUILD.gnDEPS
docs
chromoting_android_hacking.md
extensions
BUILD.gn
browser
mojo
DEPSstash_backend_unittest.cc
mash
BUILD.gnDEPS
browser_driver
BUILD.gnbrowser_driver_application_delegate.ccbrowser_driver_application_delegate.hmain.cc
example
BUILD.gn
views_examples
BUILD.gnmain.ccviews_examples_application_delegate.ccviews_examples_application_delegate.h
window_type_launcher
BUILD.gnmain.ccwindow_type_launcher.ccwindow_type_launcher.h
init
BUILD.gninit.ccinit.hmain.cc
login
BUILD.gnlogin.ccmain.cc
quick_launch
BUILD.gnmain.ccquick_launch_application.ccquick_launch_application.h
screenlock
BUILD.gnmain.ccscreenlock.ccscreenlock.h
session
BUILD.gnmain.ccsession.ccsession.h
task_viewer
BUILD.gnmain.cctask_viewer.cctask_viewer.h
wm
BUILD.gnaccelerator_registrar_unittest.ccmain.ccroot_window_controller.ccwindow_manager_application.ccwindow_manager_application.hwindow_manager_unittest.cc
media
mojo
DEPS
services
BUILD.gnandroid_mojo_media_client.ccmain.ccmedia_apptest.ccmojo_cdm.ccmojo_cdm_factory.ccmojo_decoder_factory.ccmojo_decoder_factory.hmojo_decryptor.ccmojo_media_application.ccmojo_media_application.hmojo_media_application_factory.hmojo_renderer_factory.ccservice_factory_impl.ccservice_factory_impl.h
test
BUILD.gnDEPSpipeline_integration_test.cc
mojo
BUILD.gnDEPS
common
DEPS
mojo_base.gypmojo_shell.gyp
public
cpp
bindings
tests
versioning_apptest.ccversioning_test_service.cc
mojo_application.gni
services
DEPS
catalog
BUILD.gnDEPScatalog.cccatalog.hentry.ccentry.hentry_unittest.ccfactory.ccfactory.h
public
interfaces
BUILD.gn
tracing
BUILD.gnDEPSmain.cc
public
cpp
BUILD.gntrace_provider_impl.cctracing_impl.cctracing_impl.h
tracing_app.h
shell
DEPS
services/shell
BUILD.gnDEPS
background
BUILD.gnDEPSbackground_shell.ccbackground_shell.hbackground_shell_main.ccbackground_shell_main.h
tests
BUILD.gnbackground_shell_unittest.cctest.mojomtest_catalog_store.cctest_catalog_store.htest_service.cc
connect_params.ccconnect_params.hconnect_util.ccconnect_util.hloader.hmanifest.jsonnative_runner.hnative_runner_delegate.h
public
cpp
BUILD.gnapplication_runner.happlication_test_base.hcapabilities.hconnect.hconnection.hconnector.hidentity.hinitialize_base_and_icu.ccinterface_binder.hinterface_factory.hinterface_factory_impl.hinterface_registry.h
lib
application_runner.ccapplication_test_base.ccapplication_test_main.cccapabilities.ccconnection_impl.ccconnection_impl.hconnector_impl.ccconnector_impl.hidentity.ccinit_commandline.ccinterface_factory_binder.hinterface_registry.ccmessage_loop_ref.ccnames.ccshell_client.ccshell_connection.ccshell_test.cc
message_loop_ref.hnames.hshell.hshell_client.hshell_connection.hshell_test.h
test
BUILD.gnrun_all_shelltests.cc
tests
BUILD.gninterface_registry_unittest.cc
interfaces
BUILD.gncapabilities.mojomconnector.mojominterface_provider.mojomshell.mojomshell_client.mojomshell_client_factory.mojomshell_resolver.mojom
java
BUILD.gn
src
org
chromium
mojo
application
ApplicationConnection.javaApplicationDelegate.javaApplicationImpl.javaApplicationRunner.javaServiceFactoryBinder.javaShellHelper.java
runner
BUILD.gn
child
BUILD.gnmanifest.jsonnative_apptest.ccnative_apptest_target.cctest_native_main.cctest_native_main.htest_native_service.mojom
common
BUILD.gnclient_util.ccclient_util.hswitches.ccswitches.h
host
BUILD.gnDEPSOWNERSchild_process.ccchild_process.hchild_process_base.ccchild_process_base.hchild_process_host.ccchild_process_host.hchild_process_host_unittest.cchost_unittests.ccin_process_native_runner.ccin_process_native_runner.hin_process_native_runner_unittest.cclinux_sandbox.cclinux_sandbox.hmach_broker.ccmach_broker.hnative_application_support.ccnative_application_support.hout_of_process_native_runner.ccout_of_process_native_runner.h
init.ccinit.h
shell.ccshell.h
standalone
BUILD.gnDEPScontext.cccontext.h
desktop
launcher_process.cclauncher_process.hmain.ccmain_helper.ccmain_helper.h
tracer.cctracer.h
switches.ccswitches.h
tests
BUILD.gnDEPS
connect
BUILD.gnconnect_test.mojomconnect_test_app.ccconnect_test_app_a_manifest.jsonconnect_test_app_b_manifest.jsonconnect_test_app_manifest.jsonconnect_test_class_app.ccconnect_test_class_app_manifest.jsonconnect_test_driver.ccconnect_test_driver_manifest.jsonconnect_test_exe.ccconnect_test_exe_manifest.jsonconnect_test_package.ccconnect_test_package_manifest.jsonconnect_test_singleton_app.ccconnect_test_singleton_app_manifest.jsonconnect_unittest.ccconnect_unittests_manifest.json
lifecycle
BUILD.gnapp.ccapp_client.ccapp_client.happ_manifest.jsonexe_manifest.jsonlifecycle_exe.cclifecycle_unittest.cclifecycle_unittest.mojomlifecycle_unittest_manifest.jsonpackage.ccpackage_app_a_manifest.jsonpackage_app_b_manifest.jsonpackage_manifest.jsonparent.ccparent_manifest.json
loader_unittest.cc
shell
BUILD.gndriver.ccdriver_manifest.jsonshell_unittest.ccshell_unittest.mojomshell_unittest_manifest.jsontarget.cctarget_manifest.json
test.mojomutil.ccutil.h
testing/buildbot
gn_isolate_map.pyl
third_party/WebKit/LayoutTests/harness-tests
mojo-helpers.html
ui/views/mus
BUILD.gnDEPSaura_init.ccplatform_test_helper_mus.ccscreen_mus.ccsurface_binding.ccsurface_context_factory.ccwindow_manager_connection.cc

4
BUILD.gn

@ -186,8 +186,8 @@ group("both_gn_and_gyp") {
"//mojo/edk/system:mojo_system_unittests",
"//mojo/edk/test:mojo_public_bindings_unittests",
"//mojo/edk/test:mojo_public_system_unittests",
"//mojo/shell/public/cpp",
"//net:net_perftests",
"//services/shell/public/cpp",
"//third_party/WebKit/Source/platform:blink_heap_unittests",
"//third_party/WebKit/Source/platform:blink_platform_unittests",
"//third_party/WebKit/Source/web:webkit_unit_tests",
@ -493,7 +493,7 @@ group("both_gn_and_gyp") {
"//gpu/command_buffer/client:gles2_implementation_no_check",
"//gpu/khronos_glcts_support:khronos_glcts_test", # TODO(GYP) crbug.com/471903 to make this complete.
"//mojo/edk/test:mojo_public_system_perftests",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
"//testing/gmock:gmock_main",
"//third_party/codesighs:nm2tsv",
]

4
ash/mus/BUILD.gn

@ -40,7 +40,7 @@ source_set("lib") {
"//mojo/converters/geometry",
"//mojo/converters/input_events",
"//mojo/services/tracing/public/cpp",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
"//skia/public",
"//ui/app_list/shower",
"//ui/aura",
@ -78,7 +78,7 @@ mojo_native_application("mus") {
":resources_100",
":resources_200",
":resources_strings",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
]
data_deps = [

2
ash/mus/DEPS

@ -10,7 +10,7 @@ include_rules = [
"+mojo/converters",
"+mojo/public",
"+mojo/services/tracing/public",
"+mojo/shell/public",
"+services/shell/public",
"+skia/public",
"+third_party/khronos/GLES2/gl2.h",
]

2
ash/mus/keyboard_ui_mus.cc

@ -8,7 +8,7 @@
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "base/memory/ptr_util.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connector.h"
namespace ash {

2
ash/mus/main.cc

@ -4,7 +4,7 @@
#include "ash/mus/sysui_application.h"
#include "mojo/public/c/system/main.h"
#include "mojo/shell/public/cpp/application_runner.h"
#include "services/shell/public/cpp/application_runner.h"
MojoResult MojoMain(MojoHandle shell_handle) {
mojo::ApplicationRunner runner(new ash::sysui::SysUIApplication);

2
ash/mus/shelf_delegate_mus.cc

@ -19,7 +19,7 @@
#include "components/mus/public/cpp/window.h"
#include "components/mus/public/cpp/window_property.h"
#include "mojo/common/common_type_converters.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connector.h"
#include "skia/public/type_converters.h"
#include "ui/aura/mus/mus_util.h"
#include "ui/base/resource/resource_bundle.h"

2
ash/mus/sysui_application.h

@ -11,7 +11,7 @@
#include "mash/shelf/public/interfaces/shelf.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/shell_client.h"
namespace ash {
namespace sysui {

14
chrome/app/mash/BUILD.gn

@ -21,13 +21,13 @@ source_set("mash") {
"//mash/session:lib",
"//mash/task_viewer:lib",
"//mash/wm:lib",
"//mojo/shell",
"//mojo/shell/background:lib",
"//mojo/shell/public/cpp",
"//mojo/shell/public/interfaces",
"//mojo/shell/runner/common",
"//mojo/shell/runner/host:child_process_base",
"//mojo/shell/runner/host:lib",
"//services/shell",
"//services/shell/background:lib",
"//services/shell/public/cpp",
"//services/shell/public/interfaces",
"//services/shell/runner/common",
"//services/shell/runner/host:child_process_base",
"//services/shell/runner/host:lib",
"//url",
]
data_deps = [

2
chrome/app/mash/DEPS

@ -9,5 +9,5 @@ include_rules = [
"+components/mus",
"+components/resource_provider",
"+mash",
"+mojo/shell",
"+services/shell",
]

18
chrome/app/mash/mash_runner.cc

@ -23,15 +23,15 @@
#include "mash/task_viewer/task_viewer.h"
#include "mash/wm/window_manager_application.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/shell/background/background_shell.h"
#include "mojo/shell/native_runner_delegate.h"
#include "mojo/shell/public/cpp/connector.h"
#include "mojo/shell/public/cpp/identity.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "mojo/shell/public/cpp/shell_connection.h"
#include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
#include "mojo/shell/runner/common/switches.h"
#include "mojo/shell/runner/host/child_process_base.h"
#include "services/shell/background/background_shell.h"
#include "services/shell/native_runner_delegate.h"
#include "services/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/identity.h"
#include "services/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/shell_connection.h"
#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"
#if defined(OS_LINUX)
#include "components/font_service/font_service_app.h"

2
chrome/app/mash/mash_runner.h

@ -7,7 +7,7 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "mojo/shell/public/interfaces/shell_client.mojom.h"
#include "services/shell/public/interfaces/shell_client.mojom.h"
namespace mojo {
class ShellClient;

4
chrome/browser/BUILD.gn

@ -373,9 +373,9 @@ source_set("browser") {
"//mojo/edk/system",
"//mojo/public/cpp/bindings",
"//mojo/public/js",
"//mojo/shell/public/cpp",
"//net:extras",
"//net:net_with_v8",
"//services/shell/public/cpp",
"//skia/public",
"//storage/browser",
"//storage/common",
@ -609,7 +609,7 @@ source_set("browser") {
"//components/prefs",
"//content/public/common",
"//mash/shelf/public/interfaces",
"//mojo/shell/runner/common",
"//services/shell/runner/common",
"//skia/public",
"//ui/aura",
"//ui/compositor",

2
chrome/browser/DEPS

@ -37,7 +37,7 @@ include_rules = [
"+media/mojo", # For mojo media services.
"+mojo/converters",
"+mojo/runner/child",
"+mojo/shell/public/cpp",
"+services/shell/public/cpp",
"+policy", # For generated headers and source
"+ppapi/c", # For various types.
"+ppapi/host",

2
chrome/browser/chrome_content_browser_client.cc

@ -160,12 +160,12 @@
#include "device/usb/public/interfaces/chooser_service.mojom.h"
#include "device/usb/public/interfaces/device_manager.mojom.h"
#include "gin/v8_initializer.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "net/base/mime_util.h"
#include "net/cookies/canonical_cookie.h"
#include "net/cookies/cookie_options.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "ppapi/host/ppapi_host.h"
#include "services/shell/public/cpp/shell_client.h"
#include "storage/browser/fileapi/external_mount_points.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"

2
chrome/browser/chromeos/BUILD.gn

@ -89,9 +89,9 @@ source_set("chromeos") {
"//media",
"//media/mojo/interfaces",
"//mojo/common",
"//mojo/shell/public/cpp",
"//net",
"//ppapi/proxy:ipc", # For PpapiMsg_LoadPlugin
"//services/shell/public/cpp",
# TODO: care about enable_basic_printing and enable_print_preview.
"//printing",

2
chrome/browser/chromeos/chrome_interface_factory.cc

@ -5,7 +5,7 @@
#include "chrome/browser/chromeos/chrome_interface_factory.h"
#include "chrome/browser/ui/ash/keyboard_ui_service.h"
#include "mojo/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connection.h"
namespace chromeos {

2
chrome/browser/chromeos/chrome_interface_factory.h

@ -7,7 +7,7 @@
#include "content/public/common/mojo_shell_connection.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/shell/public/cpp/interface_factory.h"
#include "services/shell/public/cpp/interface_factory.h"
#include "ui/keyboard/keyboard.mojom.h"
class KeyboardUIService;

2
chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc

@ -10,7 +10,7 @@
#include "chrome/grit/theme_resources.h"
#include "components/prefs/pref_service.h"
#include "content/public/common/mojo_shell_connection.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connector.h"
#include "skia/public/type_converters.h"
#include "ui/base/resource/resource_bundle.h"

4
chrome/test/BUILD.gn

@ -1355,8 +1355,8 @@ if (!is_android) {
]
deps += [
"//mojo/shell/background:lib",
"//mojo/shell/background/tests:test_support",
"//services/shell/background:lib",
"//services/shell/background/tests:test_support",
]
data_deps += [

1
chrome/test/DEPS

@ -9,6 +9,7 @@ include_rules = [
"+device/bluetooth/dbus",
"+extensions",
"+mojo",
"+services",
# Tests under chrome/ shouldn't need to access the internals of content/ and
# as such are allowed only content/public. If you find yourself wanting to

12
chrome/test/base/mash_browser_tests_main.cc

@ -14,12 +14,12 @@
#include "chrome/test/base/mojo_test_connector.h"
#include "content/public/common/mojo_shell_connection.h"
#include "content/public/test/test_launcher.h"
#include "mojo/shell/public/cpp/connector.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "mojo/shell/public/cpp/shell_connection.h"
#include "mojo/shell/runner/common/switches.h"
#include "mojo/shell/runner/host/child_process.h"
#include "mojo/shell/runner/init.h"
#include "services/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/shell_connection.h"
#include "services/shell/runner/common/switches.h"
#include "services/shell/runner/host/child_process.h"
#include "services/shell/runner/init.h"
namespace {

18
chrome/test/base/mojo_test_connector.cc

@ -18,15 +18,15 @@
#include "mojo/edk/embedder/process_delegate.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/services/catalog/store.h"
#include "mojo/shell/background/tests/test_catalog_store.h"
#include "mojo/shell/native_runner_delegate.h"
#include "mojo/shell/public/cpp/connector.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "mojo/shell/public/cpp/shell_connection.h"
#include "mojo/shell/runner/common/client_util.h"
#include "mojo/shell/runner/common/switches.h"
#include "mojo/shell/shell.h"
#include "mojo/shell/switches.h"
#include "services/shell/background/tests/test_catalog_store.h"
#include "services/shell/native_runner_delegate.h"
#include "services/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/shell_connection.h"
#include "services/shell/runner/common/client_util.h"
#include "services/shell/runner/common/switches.h"
#include "services/shell/shell.h"
#include "services/shell/switches.h"
using mojo::shell::mojom::ShellClient;
using mojo::shell::mojom::ShellClientPtr;

4
chrome/test/base/mojo_test_connector.h

@ -9,8 +9,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/process/process_handle.h"
#include "base/test/launcher/test_launcher.h"
#include "mojo/shell/background/background_shell.h"
#include "mojo/shell/public/interfaces/shell_client.mojom.h"
#include "services/shell/background/background_shell.h"
#include "services/shell/public/interfaces/shell_client.mojom.h"
namespace base {
class CommandLine;

2
chromecast/browser/DEPS

@ -16,6 +16,6 @@ include_rules = [
"+media/audio",
"+media/base",
"+media/mojo",
"+mojo/shell/public",
"+services/shell/public",
"+ui/ozone/platform/cast/overlay_manager_cast.h",
]

2
chromecast/browser/media/BUILD.gn

@ -35,7 +35,7 @@ source_set("media") {
public_deps = [
"//media/mojo/interfaces",
"//media/mojo/services:application",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
]
}

2
chromecast/browser/media/cast_mojo_media_application.cc

@ -9,7 +9,7 @@
#include "chromecast/browser/media/cast_mojo_media_client.h"
#include "media/base/media_log.h"
#include "media/mojo/services/service_factory_impl.h"
#include "mojo/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connection.h"
namespace {
void CreateServiceFactory(

6
chromecast/browser/media/cast_mojo_media_application.h

@ -9,9 +9,9 @@
#include "base/memory/ref_counted.h"
#include "media/mojo/interfaces/service_factory.mojom.h"
#include "mojo/shell/public/cpp/interface_factory.h"
#include "mojo/shell/public/cpp/message_loop_ref.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/interface_factory.h"
#include "services/shell/public/cpp/message_loop_ref.h"
#include "services/shell/public/cpp/shell_client.h"
namespace base {
class SingleThreadTaskRunner;

4
components/bitmap_uploader/BUILD.gn

@ -21,7 +21,7 @@ component("bitmap_uploader") {
"//mojo/converters/surfaces",
"//mojo/gles2",
"//mojo/public/c/system:for_component",
"//mojo/shell/public/cpp",
"//mojo/shell/public/interfaces",
"//services/shell/public/cpp",
"//services/shell/public/interfaces",
]
}

2
components/bitmap_uploader/DEPS

@ -1,7 +1,7 @@
include_rules = [
"+components/mus/public",
"+gpu/GLES2",
"+mojo/shell/public",
"+services/shell/public",
"+mojo/common",
"+mojo/converters/geometry",
"+mojo/converters/surfaces",

2
components/bitmap_uploader/bitmap_uploader.cc

@ -16,7 +16,7 @@
#include "mojo/converters/surfaces/surfaces_utils.h"
#include "mojo/public/c/gles2/chromium_extension.h"
#include "mojo/public/c/gles2/gles2.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connector.h"
namespace bitmap_uploader {
namespace {

12
components/filesystem/BUILD.gn

@ -26,8 +26,8 @@ source_set("lib") {
"//mojo/common",
"//mojo/common:common_base",
"//mojo/platform_handle",
"//mojo/shell/public/cpp",
"//mojo/shell/public/interfaces",
"//services/shell/public/cpp",
"//services/shell/public/interfaces",
"//url",
]
}
@ -48,7 +48,7 @@ mojo_native_application("filesystem") {
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
"//mojo/services/tracing/public/cpp",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
]
data_deps = [
@ -77,9 +77,9 @@ test("unittests") {
"//mojo/common",
"//mojo/platform_handle",
"//mojo/public/cpp/bindings",
"//mojo/shell/public/cpp:shell_test_support",
"//mojo/shell/public/cpp:sources",
"//mojo/shell/public/cpp/test:run_all_shelltests",
"//services/shell/public/cpp:shell_test_support",
"//services/shell/public/cpp:sources",
"//services/shell/public/cpp/test:run_all_shelltests",
]
data_deps = [

2
components/filesystem/DEPS

@ -1,7 +1,7 @@
include_rules = [
"+components/prefs",
"+mojo/common",
"+mojo/shell",
"+services/shell",
"+mojo/platform_handle",
"+mojo/public",
"+mojo/services/tracing/public/cpp",

4
components/filesystem/file_system_app.cc

@ -7,8 +7,8 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "mojo/shell/public/cpp/connection.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connector.h"
#if defined(OS_WIN)
#include "base/base_paths_win.h"

4
components/filesystem/file_system_app.h

@ -11,8 +11,8 @@
#include "components/filesystem/lock_table.h"
#include "components/filesystem/public/interfaces/file_system.mojom.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
#include "mojo/shell/public/cpp/interface_factory.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/interface_factory.h"
#include "services/shell/public/cpp/shell_client.h"
namespace mojo {
class Connector;

2
components/filesystem/file_system_impl.cc

@ -16,7 +16,7 @@
#include "build/build_config.h"
#include "components/filesystem/directory_impl.h"
#include "components/filesystem/lock_table.h"
#include "mojo/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connection.h"
#include "url/gurl.h"
namespace filesystem {

2
components/filesystem/files_test_base.cc

@ -8,8 +8,8 @@
#include "components/filesystem/public/interfaces/directory.mojom.h"
#include "components/filesystem/public/interfaces/types.mojom.h"
#include "mojo/shell/public/cpp/connector.h"
#include "mojo/util/capture_util.h"
#include "services/shell/public/cpp/connector.h"
namespace filesystem {

2
components/filesystem/files_test_base.h

@ -8,7 +8,7 @@
#include "base/macros.h"
#include "components/filesystem/public/interfaces/file_system.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/shell/public/cpp/shell_test.h"
#include "services/shell/public/cpp/shell_test.h"
namespace filesystem {

1
components/filesystem/filesystem.gyp

@ -32,6 +32,7 @@
'dependencies': [
'filesystem_bindings',
'../../mojo/mojo_base.gyp:mojo_application_base',
'../../mojo/mojo_base.gyp:mojo_application_bindings',
'../../mojo/mojo_edk.gyp:mojo_system_impl',
'../../mojo/mojo_public.gyp:mojo_cpp_bindings',
'../../mojo/mojo_platform_handle.gyp:platform_handle',

2
components/filesystem/main.cc

@ -5,7 +5,7 @@
#include "base/macros.h"
#include "components/filesystem/file_system_app.h"
#include "mojo/public/c/system/main.h"
#include "mojo/shell/public/cpp/application_runner.h"
#include "services/shell/public/cpp/application_runner.h"
MojoResult MojoMain(MojoHandle request) {
mojo::ApplicationRunner runner(new filesystem::FileSystemApp());

2
components/filesystem/public/cpp/prefs/BUILD.gn

@ -15,7 +15,7 @@ source_set("prefs") {
"//components/filesystem/public/interfaces",
"//components/prefs",
"//mojo/common",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
]
data_deps = [

2
components/filesystem/public/cpp/prefs/pref_service_factory.cc

@ -12,7 +12,7 @@
#include "components/prefs/pref_value_store.h"
#include "components/prefs/value_map_pref_store.h"
#include "components/prefs/writeable_pref_store.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connector.h"
namespace filesystem {

4
components/font_service/BUILD.gn

@ -18,7 +18,7 @@ source_set("lib") {
"//mojo/platform_handle",
"//mojo/public/cpp/bindings",
"//mojo/services/tracing/public/cpp",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
]
public_deps = [
@ -37,7 +37,7 @@ mojo_native_application("font_service") {
"//mojo/common",
"//mojo/common:common_base",
"//mojo/public/cpp/bindings:callback",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
]
data_deps = [

2
components/font_service/DEPS

@ -1,5 +1,5 @@
include_rules = [
"+mojo/shell",
"+services/shell",
"+mojo/common",
"+mojo/message_pump",
"+mojo/platform_handle",

2
components/font_service/font_service_app.cc

@ -9,7 +9,7 @@
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "mojo/platform_handle/platform_handle_functions.h"
#include "mojo/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connection.h"
static_assert(static_cast<uint32_t>(SkTypeface::kNormal) ==
static_cast<uint32_t>(font_service::TypefaceStyle::NORMAL),

4
components/font_service/font_service_app.h

@ -12,8 +12,8 @@
#include "components/font_service/public/interfaces/font_service.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
#include "mojo/shell/public/cpp/interface_factory.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/interface_factory.h"
#include "services/shell/public/cpp/shell_client.h"
#include "skia/ext/skia_utils_base.h"
namespace font_service {

2
components/font_service/main.cc

@ -4,7 +4,7 @@
#include "components/font_service/font_service_app.h"
#include "mojo/public/c/system/main.h"
#include "mojo/shell/public/cpp/application_runner.h"
#include "services/shell/public/cpp/application_runner.h"
MojoResult MojoMain(MojoHandle shell_handle) {
mojo::ApplicationRunner runner(new font_service::FontServiceApp);

4
components/font_service/public/cpp/BUILD.gn

@ -20,8 +20,8 @@ source_set("cpp") {
"//mojo/platform_handle",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
"//mojo/shell/public/cpp",
"//mojo/shell/public/interfaces",
"//services/shell/public/cpp",
"//services/shell/public/interfaces",
"//skia",
]
}

2
components/font_service/public/cpp/font_loader.cc

@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/trace_event/trace_event.h"
#include "components/font_service/public/cpp/font_service_thread.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connector.h"
namespace font_service {

10
components/leveldb/BUILD.gn

@ -25,7 +25,7 @@ source_set("lib") {
"//mojo/common",
"//mojo/message_pump",
"//mojo/platform_handle",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
"//third_party/leveldatabase",
]
}
@ -45,7 +45,7 @@ mojo_native_application("leveldb") {
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
"//mojo/services/tracing/public/cpp",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
]
data_deps = [
@ -72,9 +72,9 @@ test("leveldb_service_unittests") {
"//mojo/common",
"//mojo/platform_handle",
"//mojo/public/cpp/bindings",
"//mojo/shell/public/cpp:shell_test_support",
"//mojo/shell/public/cpp:sources",
"//mojo/shell/public/cpp/test:run_all_shelltests",
"//services/shell/public/cpp:shell_test_support",
"//services/shell/public/cpp:sources",
"//services/shell/public/cpp/test:run_all_shelltests",
"//third_party/leveldatabase",
]

2
components/leveldb/DEPS

@ -5,7 +5,7 @@ include_rules = [
"+mojo/platform_handle",
"+mojo/public",
"+mojo/services/tracing/public/cpp",
"+mojo/shell",
"+services/shell",
"+mojo/util",
"+third_party/leveldatabase",
]

2
components/leveldb/leveldb_app.cc

@ -6,7 +6,7 @@
#include "base/message_loop/message_loop.h"
#include "components/leveldb/leveldb_service_impl.h"
#include "mojo/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connection.h"
namespace leveldb {

4
components/leveldb/leveldb_app.h

@ -8,8 +8,8 @@
#include "components/leveldb/public/interfaces/leveldb.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
#include "mojo/shell/public/cpp/interface_factory.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/interface_factory.h"
#include "services/shell/public/cpp/shell_client.h"
namespace leveldb {

4
components/leveldb/leveldb_service_unittest.cc

@ -9,9 +9,9 @@
#include "components/leveldb/public/interfaces/leveldb.mojom.h"
#include "mojo/common/common_type_converters.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/shell/public/cpp/shell_connection.h"
#include "mojo/shell/public/cpp/shell_test.h"
#include "mojo/util/capture_util.h"
#include "services/shell/public/cpp/shell_connection.h"
#include "services/shell/public/cpp/shell_test.h"
using filesystem::FileError;
using mojo::Capture;

2
components/leveldb/main.cc

@ -5,7 +5,7 @@
#include "base/macros.h"
#include "components/leveldb/leveldb_app.h"
#include "mojo/public/c/system/main.h"
#include "mojo/shell/public/cpp/application_runner.h"
#include "services/shell/public/cpp/application_runner.h"
MojoResult MojoMain(MojoHandle application_request) {
mojo::ApplicationRunner runner(new leveldb::LevelDBApp());

2
components/leveldb/public/cpp/BUILD.gn

@ -14,7 +14,7 @@ source_set("cpp") {
"//base",
"//components/leveldb/public/interfaces",
"//mojo/common",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
"//third_party/leveldatabase",
]
}

4
components/leveldb/remote_iterator_unittest.cc

@ -8,9 +8,9 @@
#include "components/leveldb/public/cpp/remote_iterator.h"
#include "components/leveldb/public/interfaces/leveldb.mojom.h"
#include "mojo/common/common_type_converters.h"
#include "mojo/shell/public/cpp/shell_connection.h"
#include "mojo/shell/public/cpp/shell_test.h"
#include "mojo/util/capture_util.h"
#include "services/shell/public/cpp/shell_connection.h"
#include "services/shell/public/cpp/shell_test.h"
using mojo::Capture;

4
components/mus/BUILD.gn

@ -20,7 +20,7 @@ mojo_native_application("mus") {
":resources_200",
":resources_strings",
"//mojo/platform_handle:for_shared_library",
"//mojo/shell/public/cpp:sources",
"//services/shell/public/cpp:sources",
]
if (is_win) {
@ -81,7 +81,7 @@ source_set("lib") {
"//components/resource_provider/public/cpp",
"//mojo/common:common_base",
"//mojo/services/tracing/public/cpp",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
"//ui/events",
"//ui/events/ozone:events_ozone_layout",
"//ui/gl:gl",

2
components/mus/DEPS

@ -7,7 +7,7 @@ include_rules = [
"+mojo/converters",
"+mojo/public",
"+mojo/services/tracing/public",
"+mojo/shell",
"+services/shell",
"+third_party/skia/include",
"+ui",
]

4
components/mus/demo/BUILD.gn

@ -18,8 +18,8 @@ mojo_native_application("mus_demo") {
"//components/mus/public/cpp",
"//components/mus/public/interfaces",
"//mojo/public/cpp/bindings",
"//mojo/shell/public/cpp",
"//mojo/shell/public/cpp:sources",
"//services/shell/public/cpp",
"//services/shell/public/cpp:sources",
"//skia",
"//ui/gfx/geometry",
]

2
components/mus/demo/main.cc

@ -4,7 +4,7 @@
#include "components/mus/demo/mus_demo.h"
#include "mojo/public/c/system/main.h"
#include "mojo/shell/public/cpp/application_runner.h"
#include "services/shell/public/cpp/application_runner.h"
MojoResult MojoMain(MojoHandle shell_handle) {
mojo::ApplicationRunner runner(new mus_demo::MusDemo);

4
components/mus/demo/mus_demo.h

@ -18,8 +18,8 @@
#include "components/mus/public/cpp/window_tree_delegate.h"
#include "components/mus/public/interfaces/window_tree_host.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/shell/public/cpp/connector.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/shell_client.h"
#include "third_party/skia/include/core/SkBitmap.h"
namespace bitmap_uploader {

2
components/mus/gles2/BUILD.gn

@ -9,7 +9,7 @@ source_set("gles2") {
"//components/mus:*",
"//components/mus/ws:*",
"//components/mus/surfaces:*",
"//mojo/shell/standalone:lib", # For android
"//services/shell/standalone:lib", # For android
]
sources = [

2
components/mus/main.cc

@ -4,7 +4,7 @@
#include "components/mus/mus_app.h"
#include "mojo/public/c/system/main.h"
#include "mojo/shell/public/cpp/application_runner.h"
#include "services/shell/public/cpp/application_runner.h"
MojoResult MojoMain(MojoHandle shell_handle) {
mojo::ApplicationRunner runner(new mus::MandolineUIServicesApp);

4
components/mus/mus_app.cc

@ -24,8 +24,8 @@
#include "components/resource_provider/public/cpp/resource_loader.h"
#include "mojo/public/c/system/main.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
#include "mojo/shell/public/cpp/connection.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connector.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/events/event_switches.h"

6
components/mus/mus_app.h

@ -22,9 +22,9 @@
#include "components/mus/ws/user_id.h"
#include "components/mus/ws/window_server_delegate.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
#include "mojo/shell/public/cpp/application_runner.h"
#include "mojo/shell/public/cpp/interface_factory.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/application_runner.h"
#include "services/shell/public/cpp/interface_factory.h"
#include "services/shell/public/cpp/shell_client.h"
namespace mojo {
class Connector;

4
components/mus/public/cpp/BUILD.gn

@ -56,8 +56,8 @@ source_set("cpp") {
"//mojo/gpu:mojo_gles2_implementation",
"//mojo/public/cpp/bindings:bindings",
"//mojo/public/cpp/system",
"//mojo/shell/public/cpp",
"//mojo/shell/public/interfaces",
"//services/shell/public/cpp",
"//services/shell/public/interfaces",
"//ui/events",
"//ui/gfx/geometry",
"//ui/mojo/geometry:interfaces",

2
components/mus/public/cpp/lib/window_tree_client_impl.cc

@ -21,7 +21,7 @@
#include "components/mus/public/cpp/window_tree_delegate.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/input_events/input_events_type_converters.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connector.h"
#include "ui/events/event.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/size.h"

2
components/mus/public/cpp/lib/window_tree_host_factory.cc

@ -6,7 +6,7 @@
#include "components/mus/public/cpp/window_tree_connection.h"
#include "components/mus/public/cpp/window_tree_delegate.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connector.h"
namespace mus {

8
components/mus/public/cpp/tests/BUILD.gn

@ -31,9 +31,9 @@ source_set("test_support") {
"//base/test:test_config",
"//components/mus/common:mus_common",
"//components/mus/public/cpp",
"//mojo/shell/public/cpp:shell_test_support",
"//mojo/shell/public/cpp:sources",
"//mojo/shell/public/cpp:test_support",
"//services/shell/public/cpp:shell_test_support",
"//services/shell/public/cpp:sources",
"//services/shell/public/cpp:test_support",
"//testing/gtest",
"//ui/gl",
]
@ -64,7 +64,7 @@ test("mojo_view_manager_lib_unittests") {
"//mojo/gles2",
"//mojo/platform_handle:platform_handle_impl",
"//mojo/public/cpp/system",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
"//testing/gtest",
"//ui/events",
"//ui/gfx:test_support",

4
components/mus/public/cpp/tests/window_server_shelltest_base.cc

@ -8,8 +8,8 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "components/mus/common/args.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "mojo/shell/public/cpp/shell_test.h"
#include "services/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/shell_test.h"
#include "ui/gl/gl_switches.h"
namespace mus {

4
components/mus/public/cpp/tests/window_server_shelltest_base.h

@ -6,8 +6,8 @@
#define COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_SHELLTEST_BASE_H_
#include "base/macros.h"
#include "mojo/shell/public/cpp/connection.h"
#include "mojo/shell/public/cpp/shell_test.h"
#include "services/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/shell_test.h"
namespace mus {

2
components/mus/public/cpp/tests/window_server_test_base.cc

@ -11,7 +11,7 @@
#include "components/mus/public/cpp/window.h"
#include "components/mus/public/cpp/window_tree_connection.h"
#include "components/mus/public/cpp/window_tree_host_factory.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connector.h"
namespace mus {
namespace {

2
components/mus/public/cpp/tests/window_server_test_base.h

@ -12,7 +12,7 @@
#include "components/mus/public/cpp/window_tree_delegate.h"
#include "components/mus/public/interfaces/window_tree.mojom.h"
#include "components/mus/public/interfaces/window_tree_host.mojom.h"
#include "mojo/shell/public/cpp/interface_factory.h"
#include "services/shell/public/cpp/interface_factory.h"
namespace mus {

2
components/mus/public/cpp/window.h

@ -16,7 +16,7 @@
#include "components/mus/public/interfaces/surface_id.mojom.h"
#include "components/mus/public/interfaces/window_tree.mojom.h"
#include "mojo/public/cpp/bindings/array.h"
#include "mojo/shell/public/interfaces/interface_provider.mojom.h"
#include "services/shell/public/interfaces/interface_provider.mojom.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/rect.h"

2
components/mus/public/cpp/window_tree_delegate.h

@ -8,7 +8,7 @@
#include <string>
#include "components/mus/public/interfaces/window_tree.mojom.h"
#include "mojo/shell/public/interfaces/interface_provider.mojom.h"
#include "services/shell/public/interfaces/interface_provider.mojom.h"
namespace mus {

2
components/mus/surfaces/BUILD.gn

@ -29,7 +29,7 @@ source_set("surfaces") {
"//mojo/converters/geometry",
"//mojo/converters/surfaces",
"//mojo/services/tracing/public/cpp",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
"//ui/gfx",
"//ui/gl",
"//ui/mojo/geometry:interfaces",

2
components/mus/surfaces/DEPS

@ -2,7 +2,7 @@ include_rules = [
"+cc",
"+components/gpu",
"+gpu",
"+mojo/shell",
"+services/shell",
"+mojo/common",
"+mojo/converters",
"+mojo/public",

14
components/mus/ws/BUILD.gn

@ -98,8 +98,8 @@ source_set("lib") {
"//mojo/converters/surfaces",
"//mojo/public/cpp/bindings:callback",
"//mojo/services/tracing/public/cpp",
"//mojo/shell/public/cpp",
"//mojo/shell/public/interfaces",
"//services/shell/public/cpp",
"//services/shell/public/interfaces",
"//ui/base",
"//ui/events",
"//ui/events/platform",
@ -186,11 +186,11 @@ test("mus_ws_unittests") {
"//mojo/gles2",
"//mojo/platform_handle:for_component",
"//mojo/public/cpp/bindings:bindings",
"//mojo/shell/public/cpp:shell_test_support",
"//mojo/shell/public/cpp:sources",
"//mojo/shell/public/cpp:test_support",
"//mojo/shell/public/cpp/test:run_all_shelltests",
"//mojo/shell/public/interfaces",
"//services/shell/public/cpp:shell_test_support",
"//services/shell/public/cpp:sources",
"//services/shell/public/cpp:test_support",
"//services/shell/public/cpp/test:run_all_shelltests",
"//services/shell/public/interfaces",
"//testing/gtest",
"//ui/events",
"//ui/gfx",

2
components/mus/ws/display.cc

@ -20,7 +20,7 @@
#include "components/mus/ws/window_tree_binding.h"
#include "mojo/common/common_type_converters.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/shell/public/interfaces/connector.mojom.h"
#include "services/shell/public/interfaces/connector.mojom.h"
#include "ui/base/cursor/cursor.h"
namespace mus {

2
components/mus/ws/display_binding.cc

@ -8,7 +8,7 @@
#include "components/mus/ws/window_manager_access_policy.h"
#include "components/mus/ws/window_server.h"
#include "components/mus/ws/window_tree.h"
#include "mojo/shell/public/interfaces/connector.mojom.h"
#include "services/shell/public/interfaces/connector.mojom.h"
namespace mus {
namespace ws {

4
components/mus/ws/platform_display.cc

@ -28,8 +28,8 @@
#include "mojo/converters/surfaces/surfaces_type_converters.h"
#include "mojo/converters/surfaces/surfaces_utils.h"
#include "mojo/converters/transform/transform_type_converters.h"
#include "mojo/shell/public/cpp/connection.h"
#include "mojo/shell/public/cpp/connector.h"
#include "services/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connector.h"
#include "third_party/skia/include/core/SkXfermode.h"
#include "ui/base/cursor/cursor_loader.h"
#include "ui/events/event.h"

2
components/mus/ws/test_utils.cc

@ -10,7 +10,7 @@
#include "components/mus/ws/window_manager_access_policy.h"
#include "components/mus/ws/window_manager_factory_service.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/shell/public/interfaces/connector.mojom.h"
#include "services/shell/public/interfaces/connector.mojom.h"
namespace mus {
namespace ws {

2
components/mus/ws/user_id_tracker.cc

@ -5,7 +5,7 @@
#include "components/mus/ws/user_id_tracker.h"
#include "components/mus/ws/user_id_tracker_observer.h"
#include "mojo/shell/public/interfaces/connector.mojom.h"
#include "services/shell/public/interfaces/connector.mojom.h"
namespace mus {
namespace ws {

2
components/mus/ws/window_manager_state.cc

@ -13,7 +13,7 @@
#include "components/mus/ws/user_id_tracker.h"
#include "components/mus/ws/window_server.h"
#include "components/mus/ws/window_tree.h"
#include "mojo/shell/public/interfaces/connector.mojom.h"
#include "services/shell/public/interfaces/connector.mojom.h"
#include "ui/events/event.h"
namespace mus {

2
components/mus/ws/window_manager_state_unittest.cc

@ -23,7 +23,7 @@
#include "components/mus/ws/window_manager_state.h"
#include "components/mus/ws/window_server.h"
#include "components/mus/ws/window_tree.h"
#include "mojo/shell/public/interfaces/connector.mojom.h"
#include "services/shell/public/interfaces/connector.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/events/event.h"

2
components/mus/ws/window_server.cc

@ -21,7 +21,7 @@
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/input_events/input_events_type_converters.h"
#include "mojo/converters/surfaces/surfaces_type_converters.h"
#include "mojo/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connection.h"
#include "ui/gfx/geometry/size_conversions.h"
namespace mus {

2
components/mus/ws/window_tree_client_unittest.cc

@ -17,7 +17,7 @@
#include "components/mus/ws/test_change_tracker.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/public/cpp/bindings/associated_binding.h"
#include "mojo/shell/public/cpp/shell_test.h"
#include "services/shell/public/cpp/shell_test.h"
using mojo::Array;
using mojo::Callback;

2
components/mus/ws/window_tree_unittest.cc

@ -31,7 +31,7 @@
#include "components/mus/ws/window_tree.h"
#include "components/mus/ws/window_tree_binding.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/shell/public/interfaces/connector.mojom.h"
#include "services/shell/public/interfaces/connector.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/events/event.h"
#include "ui/events/event_utils.h"

4
components/profile_service/BUILD.gn

@ -26,8 +26,8 @@ source_set("lib") {
"//mojo/message_pump",
"//mojo/platform_handle",
"//mojo/services/tracing/public/cpp",
"//mojo/shell/public/cpp",
"//mojo/shell/public/interfaces",
"//services/shell/public/cpp",
"//services/shell/public/interfaces",
"//url",
]
}

2
components/profile_service/DEPS

@ -6,6 +6,6 @@ include_rules = [
"+mojo/platform_handle",
"+mojo/public",
"+mojo/services/tracing/public/cpp",
"+mojo/shell",
"+services/shell",
"+mojo/util",
]

2
components/profile_service/profile_app.cc

@ -11,7 +11,7 @@
#include "components/profile_service/profile_service_impl.h"
#include "components/profile_service/user_id_map.h"
#include "mojo/public/cpp/bindings/callback.h"
#include "mojo/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connection.h"
namespace profile {

4
components/profile_service/profile_app.h

@ -11,8 +11,8 @@
#include "components/profile_service/public/interfaces/profile.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
#include "mojo/shell/public/cpp/interface_factory.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "services/shell/public/cpp/interface_factory.h"
#include "services/shell/public/cpp/shell_client.h"
namespace profile {

1
components/profile_service/profile_service.gyp

@ -31,6 +31,7 @@
'../../components/filesystem/filesystem.gyp:filesystem_lib',
'../../components/leveldb/leveldb.gyp:leveldb_lib',
'../../mojo/mojo_base.gyp:mojo_application_base',
'../../mojo/mojo_base.gyp:mojo_application_bindings',
'../../mojo/mojo_base.gyp:tracing_service',
'../../mojo/mojo_edk.gyp:mojo_system_impl',
'../../mojo/mojo_public.gyp:mojo_cpp_bindings',

4
components/profile_service/profile_service_impl.cc

@ -12,8 +12,8 @@
#include "components/filesystem/directory_impl.h"
#include "components/filesystem/lock_table.h"
#include "components/filesystem/public/interfaces/types.mojom.h"
#include "mojo/shell/public/cpp/connection.h"
#include "mojo/shell/public/cpp/message_loop_ref.h"
#include "services/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/message_loop_ref.h"
namespace profile {

2
components/profile_service/profile_service_impl.h

@ -10,7 +10,7 @@
#include "components/profile_service/public/interfaces/profile.mojom.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connection.h"
namespace filesystem {
class LockTable;

18
components/resource_provider/BUILD.gn

@ -19,7 +19,7 @@ if (is_android) {
deps = [
":java_library",
":resource_provider_lib",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
]
}
@ -37,7 +37,7 @@ if (is_android) {
"//components/resource_provider/public/interfaces",
"//mojo/platform_handle:for_shared_library",
"//mojo/public/c/system:for_shared_library",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
"//url",
]
}
@ -74,7 +74,7 @@ if (is_android) {
":lib",
"//base",
"//components/resource_provider/public/interfaces",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
"//url",
]
@ -105,7 +105,7 @@ source_set("lib") {
"//mojo/common:common_base",
"//mojo/platform_handle",
"//mojo/services/tracing/public/cpp",
"//mojo/shell/public/cpp",
"//services/shell/public/cpp",
"//url",
]
}
@ -121,9 +121,9 @@ test("resource_provider_unittests") {
":test_interfaces",
"//base",
"//components/resource_provider/public/interfaces",
"//mojo/shell/background:main",
"//mojo/shell/public/cpp:shell_test_support",
"//mojo/shell/public/cpp/test:run_all_shelltests",
"//services/shell/background:main",
"//services/shell/public/cpp:shell_test_support",
"//services/shell/public/cpp/test:run_all_shelltests",
"//testing/gtest",
"//url",
]
@ -152,8 +152,8 @@ mojo_native_application("test_app") {
"//base",
"//components/resource_provider/public/cpp",
"//components/resource_provider/public/interfaces",
"//mojo/shell/public/cpp",
"//mojo/shell/public/interfaces",
"//services/shell/public/cpp",
"//services/shell/public/interfaces",
]
data_deps = [

2
components/resource_provider/DEPS

@ -1,5 +1,5 @@
include_rules = [
"+mojo/shell",
"+services/shell",
"+mojo/common",
"+mojo/converters",
"+mojo/platform_handle",

2
components/resource_provider/main.cc

@ -4,7 +4,7 @@
#include "components/resource_provider/resource_provider_app.h"
#include "mojo/public/c/system/main.h"
#include "mojo/shell/public/cpp/application_runner.h"
#include "services/shell/public/cpp/application_runner.h"
MojoResult MojoMain(MojoHandle shell_handle) {
mojo::ApplicationRunner runner(

4
components/resource_provider/public/cpp/BUILD.gn

@ -15,7 +15,7 @@ source_set("cpp") {
"//mojo/platform_handle",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
"//mojo/shell/public/cpp",
"//mojo/shell/public/interfaces",
"//services/shell/public/cpp",
"//services/shell/public/interfaces",
]
}

6
components/resource_provider/public/cpp/resource_loader.cc

@ -11,9 +11,9 @@
#include "base/files/file.h"
#include "mojo/common/common_type_converters.h"
#include "mojo/platform_handle/platform_handle_functions.h"
#include "mojo/shell/public/cpp/connector.h"
#include "mojo/shell/public/interfaces/connector.mojom.h"
#include "mojo/shell/public/interfaces/interface_provider.mojom.h"
#include "services/shell/public/cpp/connector.h"
#include "services/shell/public/interfaces/connector.mojom.h"
#include "services/shell/public/interfaces/interface_provider.mojom.h"
namespace resource_provider {
namespace {

Some files were not shown because too many files have changed in this diff Show More