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

Side by Side Diff: content/common/mojo/mojo_shell_connection_impl.cc

Issue 1769163002: Add a instance groups to Connect(), and introduce an Identity struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 unified diff | Download patch
« no previous file with comments | « content/common/mojo/mojo_shell_connection_impl.h ('k') | content/public/test/test_mojo_app.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/mojo/mojo_shell_connection_impl.h" 5 #include "content/common/mojo/mojo_shell_connection_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 DLOG(ERROR) << "Unable to connect to the Mojo shell."; 88 DLOG(ERROR) << "Unable to connect to the Mojo shell.";
89 delete this; 89 delete this;
90 lazy_tls_ptr.Pointer()->Set(nullptr); 90 lazy_tls_ptr.Pointer()->Set(nullptr);
91 return; 91 return;
92 } 92 }
93 shell_connection_.reset(new mojo::ShellConnection(this, std::move(request))); 93 shell_connection_.reset(new mojo::ShellConnection(this, std::move(request)));
94 shell_connection_->WaitForInitialize(); 94 shell_connection_->WaitForInitialize();
95 } 95 }
96 96
97 void MojoShellConnectionImpl::Initialize(mojo::Connector* connector, 97 void MojoShellConnectionImpl::Initialize(mojo::Connector* connector,
98 const std::string& url, 98 const mojo::Identity& identity,
99 const std::string& user_id,
100 uint32_t id) { 99 uint32_t id) {
101 initialized_ = true; 100 initialized_ = true;
102 } 101 }
103 102
104 bool MojoShellConnectionImpl::AcceptConnection(mojo::Connection* connection) { 103 bool MojoShellConnectionImpl::AcceptConnection(mojo::Connection* connection) {
105 bool found = false; 104 bool found = false;
106 for (auto listener : listeners_) 105 for (auto listener : listeners_)
107 found |= listener->AcceptConnection(connection); 106 found |= listener->AcceptConnection(connection);
108 return found; 107 return found;
109 } 108 }
(...skipping 27 matching lines...) Expand all
137 // static 136 // static
138 void MojoShellConnection::Destroy() { 137 void MojoShellConnection::Destroy() {
139 // This joins the shell controller thread. 138 // This joins the shell controller thread.
140 delete Get(); 139 delete Get();
141 lazy_tls_ptr.Pointer()->Set(nullptr); 140 lazy_tls_ptr.Pointer()->Set(nullptr);
142 } 141 }
143 142
144 MojoShellConnection::~MojoShellConnection() {} 143 MojoShellConnection::~MojoShellConnection() {}
145 144
146 } // namespace content 145 } // namespace content
OLDNEW
« no previous file with comments | « content/common/mojo/mojo_shell_connection_impl.h ('k') | content/public/test/test_mojo_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698