Index: mojo/shell/application_manager.cc |
diff --git a/mojo/shell/application_manager.cc b/mojo/shell/application_manager.cc |
index aaae40a66c78c04d29c90e99db3732e8d2ab7b14..0ea038a5acb73e7a40d5eacc90ff945e9a7bc4e7 100644 |
--- a/mojo/shell/application_manager.cc |
+++ b/mojo/shell/application_manager.cc |
@@ -81,12 +81,12 @@ void ApplicationManager::Connect(scoped_ptr<ConnectParams> params) { |
params->target().url().spec()); |
DCHECK(params->target().url().is_valid()); |
- if (params->target().user_id() == mojom::Shell::kUserInherit) { |
+ if (params->target().user_id() == mojom::Connector::kUserInherit) { |
ApplicationInstance* source = GetApplicationInstance(params->source()); |
Identity target = params->target(); |
// TODO(beng): we should CHECK source. |
target.set_user_id(source ? source->identity().user_id() |
- : mojom::Shell::kUserRoot); |
+ : mojom::Connector::kUserRoot); |
params->set_target(target); |
} |
@@ -182,8 +182,8 @@ void ApplicationManager::CreateInstanceForHandle( |
// client code using this identity. |
CapabilityFilter local_filter = filter->filter.To<CapabilityFilter>(); |
// TODO(beng): obtain userid from the inbound connection. |
- Identity target_id(url.To<GURL>(), std::string(), mojom::Shell::kUserInherit, |
- local_filter); |
+ Identity target_id(url.To<GURL>(), std::string(), |
+ mojom::Connector::kUserInherit, local_filter); |
mojom::ShellClientRequest request; |
ApplicationInstance* instance = CreateInstance(target_id, &request); |
instance->BindPIDReceiver(std::move(pid_receiver)); |
@@ -226,7 +226,7 @@ bool ApplicationManager::ConnectToExistingInstance( |
ApplicationInstance* instance = GetApplicationInstance((*params)->target()); |
if (!instance) { |
Identity root_identity = (*params)->target(); |
- root_identity.set_user_id(mojom::Shell::kUserRoot); |
+ root_identity.set_user_id(mojom::Connector::kUserRoot); |
instance = GetApplicationInstance(root_identity); |
if (!instance) return false; |
} |