| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/app/mojo/mojo_init.h" | 5 #include "content/app/mojo/mojo_init.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "mojo/embedder/embedder.h" | 8 #include "mojo/embedder/embedder.h" |
| 9 #include "mojo/public/cpp/environment/environment.h" | 9 #include "mojo/public/cpp/environment/environment.h" |
| 10 #include "mojo/service_manager/service_manager.h" | 10 #include "mojo/service_manager/service_manager.h" |
| 11 | 11 |
| 12 namespace content { | 12 namespace content { |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 mojo::Environment* environment = NULL; | 16 mojo::Environment* environment = NULL; |
| 17 | 17 |
| 18 } // namespace | 18 } // namespace |
| 19 | 19 |
| 20 void InitializeMojo() { | 20 void InitializeMojo() { |
| 21 DCHECK(!environment); | 21 DCHECK(!environment); |
| 22 environment = new mojo::Environment; | 22 environment = new mojo::Environment; |
| 23 mojo::embedder::Init(); | |
| 24 mojo::ServiceManager::GetInstance(); | 23 mojo::ServiceManager::GetInstance(); |
| 25 } | 24 } |
| 26 | 25 |
| 27 void ShutdownMojo() { | 26 void ShutdownMojo() { |
| 28 delete environment; | 27 delete environment; |
| 29 environment = NULL; | 28 environment = NULL; |
| 30 } | 29 } |
| 31 | 30 |
| 32 } // namespace content | 31 } // namespace content |
| OLD | NEW |