diff options
| author | sky <sky@chromium.org> | 2015-09-15 13:08:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-15 20:09:14 +0000 |
| commit | c696b076941029dc5699c824c3937239bffae555 (patch) | |
| tree | 778a810411877ac88c463f7715a3056042f05910 /mandoline | |
| parent | 5e33f71d26d9164716df878acb72f18f041d0f77 (diff) | |
| download | chromium_src-c696b076941029dc5699c824c3937239bffae555.zip chromium_src-c696b076941029dc5699c824c3937239bffae555.tar.gz chromium_src-c696b076941029dc5699c824c3937239bffae555.tar.bz2 | |
Updates mojo:view_manager -> mojo:mus
This is necessary as the build target names were changed.
BUG=none
TEST=none
R=fsamuel@chromium.org
TBR=fsamuel@chromium.org
Review URL: https://codereview.chromium.org/1345783002
Cr-Commit-Position: refs/heads/master@{#348972}
Diffstat (limited to 'mandoline')
| -rw-r--r-- | mandoline/app/core_services_initialization.cc | 2 | ||||
| -rw-r--r-- | mandoline/ui/aura/surface_binding.cc | 2 | ||||
| -rw-r--r-- | mandoline/ui/desktop_ui/browser_manager.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mandoline/app/core_services_initialization.cc b/mandoline/app/core_services_initialization.cc index 39e36d9..17ee8f0 100644 --- a/mandoline/app/core_services_initialization.cc +++ b/mandoline/app/core_services_initialization.cc @@ -22,7 +22,7 @@ void InitCoreServicesForContext(mojo::runner::Context* context) { #endif #if !defined(OS_ANDROID) // On Android, these are Java apps which are loaded in the shell process. - manager->RegisterApplicationPackageAlias(GURL("mojo:view_manager"), + manager->RegisterApplicationPackageAlias(GURL("mojo:mus"), GURL("mojo:core_services"), "Surfaces"); manager->RegisterApplicationPackageAlias( diff --git a/mandoline/ui/aura/surface_binding.cc b/mandoline/ui/aura/surface_binding.cc index 492ec41..df2299e 100644 --- a/mandoline/ui/aura/surface_binding.cc +++ b/mandoline/ui/aura/surface_binding.cc @@ -123,7 +123,7 @@ SurfaceBinding::PerConnectionState::~PerConnectionState() { void SurfaceBinding::PerConnectionState::Init() { mojo::ServiceProviderPtr service_provider; mojo::URLRequestPtr request(mojo::URLRequest::New()); - request->url = mojo::String::From("mojo:view_manager"); + request->url = mojo::String::From("mojo:mus"); shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), nullptr, nullptr, base::Bind(&OnGotContentHandlerID)); diff --git a/mandoline/ui/desktop_ui/browser_manager.cc b/mandoline/ui/desktop_ui/browser_manager.cc index 56e8503..486670e 100644 --- a/mandoline/ui/desktop_ui/browser_manager.cc +++ b/mandoline/ui/desktop_ui/browser_manager.cc @@ -49,7 +49,7 @@ void BrowserManager::Initialize(mojo::ApplicationImpl* app) { app_ = app; mojo::URLRequestPtr request(mojo::URLRequest::New()); - request->url = "mojo:view_manager"; + request->url = "mojo:mus"; app_->ConnectToService(request.Pass(), &host_factory_); base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |