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

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

Issue 1565343003: Move mojo/application/public -> mojo/shell/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fetcher
Patch Set: . Created 4 years, 11 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
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"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/threading/thread_local.h" 12 #include "base/threading/thread_local.h"
13 #include "mojo/application/public/cpp/application_delegate.h"
14 #include "mojo/application/public/cpp/application_impl.h"
15 #include "mojo/converters/network/network_type_converters.h" 13 #include "mojo/converters/network/network_type_converters.h"
16 #include "mojo/runner/child/runner_connection.h" 14 #include "mojo/runner/child/runner_connection.h"
15 #include "mojo/shell/public/cpp/application_delegate.h"
16 #include "mojo/shell/public/cpp/application_impl.h"
17 17
18 namespace content { 18 namespace content {
19 namespace { 19 namespace {
20 using MojoShellConnectionPtr = 20 using MojoShellConnectionPtr =
21 base::ThreadLocalPointer<MojoShellConnectionImpl>; 21 base::ThreadLocalPointer<MojoShellConnectionImpl>;
22 22
23 // Env is thread local so that aura may be used on multiple threads. 23 // Env is thread local so that aura may be used on multiple threads.
24 base::LazyInstance<MojoShellConnectionPtr>::Leaky lazy_tls_ptr = 24 base::LazyInstance<MojoShellConnectionPtr>::Leaky lazy_tls_ptr =
25 LAZY_INSTANCE_INITIALIZER; 25 LAZY_INSTANCE_INITIALIZER;
26 26
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 // static 109 // static
110 void MojoShellConnection::Destroy() { 110 void MojoShellConnection::Destroy() {
111 // This joins the shell controller thread. 111 // This joins the shell controller thread.
112 delete Get(); 112 delete Get();
113 lazy_tls_ptr.Pointer()->Set(nullptr); 113 lazy_tls_ptr.Pointer()->Set(nullptr);
114 } 114 }
115 115
116 MojoShellConnection::~MojoShellConnection() {} 116 MojoShellConnection::~MojoShellConnection() {}
117 117
118 } // namespace content 118 } // namespace content
OLDNEW
« 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