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

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

Issue 531513003: Do not initialize an ApplicationManager in chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/app/mojo/mojo_browsertest.cc ('k') | content/content_app.gypi » ('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/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "mojo/application_manager/application_manager.h"
9 #include "mojo/embedder/embedder.h" 8 #include "mojo/embedder/embedder.h"
10 #include "mojo/embedder/simple_platform_support.h" 9 #include "mojo/embedder/simple_platform_support.h"
11 10
12 namespace content { 11 namespace content {
13 12
14 void InitializeMojo() { 13 void InitializeMojo() {
15 mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>( 14 mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
16 new mojo::embedder::SimplePlatformSupport())); 15 new mojo::embedder::SimplePlatformSupport()));
17 mojo::ApplicationManager::GetInstance();
18 } 16 }
19 17
20 } // namespace content 18 } // namespace content
OLDNEW
« no previous file with comments | « content/app/mojo/mojo_browsertest.cc ('k') | content/content_app.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698