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

Side by Side Diff: content/app/mojo/mojo_init.cc

Issue 281353005: Mojo: nuke EnvironmentData (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix gn Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « content/app/mojo/mojo_init.h ('k') | content/test/content_test_launcher.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 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"
10 #include "mojo/service_manager/service_manager.h" 9 #include "mojo/service_manager/service_manager.h"
11 10
12 namespace content { 11 namespace content {
13 12
14 namespace {
15
16 mojo::Environment* environment = NULL;
17
18 } // namespace
19
20 void InitializeMojo() { 13 void InitializeMojo() {
21 DCHECK(!environment);
22 environment = new mojo::Environment;
23 mojo::embedder::Init(); 14 mojo::embedder::Init();
24 mojo::ServiceManager::GetInstance(); 15 mojo::ServiceManager::GetInstance();
25 } 16 }
26 17
27 void ShutdownMojo() {
28 delete environment;
29 environment = NULL;
30 }
31
32 } // namespace content 18 } // namespace content
OLDNEW
« no previous file with comments | « content/app/mojo/mojo_init.h ('k') | content/test/content_test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698