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

Unified Diff: mash/init/init.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 | « mash/init/init.h ('k') | mash/init/public/interfaces/login.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/init/init.cc
diff --git a/mash/init/init.cc b/mash/init/init.cc
index f8e1d6bb2ff696587ff498435e424b9cd6899255..880916d5f62677130ffe2cba643de49405678e75 100644
--- a/mash/init/init.cc
+++ b/mash/init/init.cc
@@ -16,14 +16,14 @@ Init::Init() : connector_(nullptr) {}
Init::~Init() {}
void Init::Initialize(mojo::Connector* connector, const std::string& url,
- uint32_t id, uint32_t user_id) {
+ const std::string& user_id, uint32_t id) {
connector_ = connector;
mus_connection_ = connector_->Connect("mojo:mus");
StartWindowManager();
StartLogin();
}
-void Init::LoginAs(uint32_t user_id) {
+void Init::LoginAs(const mojo::String& user_id) {
connections_["mojo:mash_login"].reset();
connections_["mojo:desktop_wm"].reset();
mojo::Connector::ConnectParams params("mojo:mash_shell");
@@ -37,7 +37,7 @@ void Init::Create(mojo::Connection* connection, mojom::LoginRequest request) {
void Init::StartWindowManager() {
mojo::Connector::ConnectParams params("mojo:desktop_wm");
- params.set_user_id(2);
+ params.set_user_id("2");
StartRestartableService(
&params,
base::Bind(&Init::StartWindowManager, base::Unretained(this)));
@@ -45,7 +45,7 @@ void Init::StartWindowManager() {
void Init::StartLogin() {
mojo::Connector::ConnectParams params("mojo:mash_login");
- params.set_user_id(2);
+ params.set_user_id("2");
StartRestartableService(
&params,
base::Bind(&Init::StartLogin, base::Unretained(this)));
« no previous file with comments | « mash/init/init.h ('k') | mash/init/public/interfaces/login.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698