| Index: content/shell/browser/shell_content_browser_client.cc
|
| diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
|
| index 76c9a718fc47b5fc423246dbdebf9c986659fafb..0977510bb8d9d1907bf350c3af8f719f05899468 100644
|
| --- a/content/shell/browser/shell_content_browser_client.cc
|
| +++ b/content/shell/browser/shell_content_browser_client.cc
|
| @@ -48,6 +48,9 @@
|
| #include "base/android/path_utils.h"
|
| #include "components/crash/content/browser/crash_dump_manager_android.h"
|
| #include "content/shell/android/shell_descriptors.h"
|
| +#include "services/tracing/mojo_tracing_application_factory.h"
|
| +#include "services/ui/ime/test_ime_driver/mojo_test_ime_application_factory.h"
|
| +#include "services/ui/mojo_ui_application_factory.h"
|
| #endif
|
|
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| @@ -194,6 +197,22 @@ void ShellContentBrowserClient::RegisterInProcessServices(
|
| info.factory = base::Bind(&media::CreateMojoMediaApplication);
|
| services->insert(std::make_pair("service:media", info));
|
| #endif
|
| +#if defined(OS_ANDROID)
|
| + // Register Mus and the required services for the Mus demo to run.
|
| + content::ServiceInfo mus_info;
|
| + mus_info.factory = base::Bind(&ui::CreateMojoUIApplication);
|
| + mus_info.service_owns_context = true;
|
| + services->insert(std::make_pair("service:ui", mus_info));
|
| +
|
| + content::ServiceInfo tracing_info;
|
| + tracing_info.factory = base::Bind(&tracing::CreateMojoTracingApplication);
|
| + services->insert(std::make_pair("mojo:tracing", tracing_info));
|
| +
|
| + content::ServiceInfo test_ime_info;
|
| + test_ime_info.factory = base::Bind(&ui::test::CreateMojoTestIMEApplication);
|
| + test_ime_info.service_owns_context = true;
|
| + services->insert(std::make_pair("service:test_ime_driver", test_ime_info));
|
| +#endif
|
| }
|
|
|
| void ShellContentBrowserClient::RegisterOutOfProcessServices(
|
|
|