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

Unified Diff: content/common/mojo/mojo_shell_connection_impl.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/common/mojo/mojo_shell_connection_impl.h ('k') | content/common/mojo/service_registry_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/mojo/mojo_shell_connection_impl.cc
diff --git a/content/common/mojo/mojo_shell_connection_impl.cc b/content/common/mojo/mojo_shell_connection_impl.cc
index f53bfefee6bcc3c0f7eca86207e9fdf4a21d8ee3..cf22246756a3bd4aee00f6b18c5b0c1011eed496 100644
--- a/content/common/mojo/mojo_shell_connection_impl.cc
+++ b/content/common/mojo/mojo_shell_connection_impl.cc
@@ -65,14 +65,14 @@ void MojoShellConnectionImpl::Create() {
}
// static
-void MojoShellConnection::Create(mojo::shell::mojom::ShellClientRequest request,
+void MojoShellConnection::Create(shell::mojom::ShellClientRequest request,
bool is_external) {
DCHECK(!lazy_tls_ptr.Pointer()->Get());
MojoShellConnectionImpl* connection =
new MojoShellConnectionImpl(is_external);
lazy_tls_ptr.Pointer()->Set(connection);
connection->shell_connection_.reset(
- new mojo::ShellConnection(connection, std::move(request)));
+ new shell::ShellConnection(connection, std::move(request)));
if (is_external)
connection->WaitForShellIfNecessary();
}
@@ -92,8 +92,8 @@ MojoShellConnectionImpl* MojoShellConnectionImpl::Get() {
void MojoShellConnectionImpl::BindToRequestFromCommandLine() {
DCHECK(!shell_connection_);
- shell_connection_.reset(new mojo::ShellConnection(
- this, mojo::shell::GetShellClientRequestFromCommandLine()));
+ shell_connection_.reset(new shell::ShellConnection(
+ this, shell::GetShellClientRequestFromCommandLine()));
WaitForShellIfNecessary();
}
@@ -113,19 +113,18 @@ void MojoShellConnectionImpl::WaitForShellIfNecessary() {
}
}
-void MojoShellConnectionImpl::Initialize(mojo::Connector* connector,
- const mojo::Identity& identity,
- uint32_t id) {
-}
+void MojoShellConnectionImpl::Initialize(shell::Connector* connector,
+ const shell::Identity& identity,
+ uint32_t id) {}
-bool MojoShellConnectionImpl::AcceptConnection(mojo::Connection* connection) {
+bool MojoShellConnectionImpl::AcceptConnection(shell::Connection* connection) {
bool found = false;
for (auto listener : listeners_)
found |= listener->AcceptConnection(connection);
return found;
}
-mojo::Connector* MojoShellConnectionImpl::GetConnector() {
+shell::Connector* MojoShellConnectionImpl::GetConnector() {
DCHECK(shell_connection_);
return shell_connection_->connector();
}
« no previous file with comments | « content/common/mojo/mojo_shell_connection_impl.h ('k') | content/common/mojo/service_registry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698