Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(973)

Unified Diff: content/browser/mojo/mojo_shell_context.cc

Issue 1770533002: Change userid from a uint32_t to a string guid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@33connector
Patch Set: . Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/mojo/mojo_shell_client_host.cc ('k') | content/common/mojo/mojo_shell_connection_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/mojo/mojo_shell_context.cc
diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc
index a3cd6fa7647a630dcb989aa14c4b8d9a3835c7e0..134db5612e4879ce86f259049e82c3efc3206185 100644
--- a/content/browser/mojo/mojo_shell_context.cc
+++ b/content/browser/mojo/mojo_shell_context.cc
@@ -284,16 +284,16 @@ void MojoShellContext::ConnectToApplicationOnOwnThread(
mojo::shell::mojom::InterfaceProviderPtr exposed_services,
const mojo::shell::mojom::Connector::ConnectCallback& callback) {
scoped_ptr<mojo::shell::ConnectParams> params(new mojo::shell::ConnectParams);
- // TODO(beng): kUserRoot is obviously wrong.
+ // TODO(beng): kRootUserID is obviously wrong.
// TODO(beng): We need to set a permissive filter here temporarily because
// content is known as a bogus system: name that the application
// manager doesn't understand.
mojo::shell::Identity source_id(
- requestor_name, std::string(), mojo::shell::mojom::Connector::kUserRoot);
+ requestor_name, std::string(), mojo::shell::mojom::kRootUserID);
source_id.set_filter(mojo::shell::GetPermissiveCapabilityFilter());
params->set_source(source_id);
params->set_target(mojo::shell::Identity(
- name, std::string(), mojo::shell::mojom::Connector::kUserRoot));
+ name, std::string(), mojo::shell::mojom::kRootUserID));
params->set_remote_interfaces(std::move(request));
params->set_local_interfaces(std::move(exposed_services));
params->set_connect_callback(callback);
« no previous file with comments | « content/browser/mojo/mojo_shell_client_host.cc ('k') | content/common/mojo/mojo_shell_connection_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698