diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 17:09:37 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 17:10:44 +0000 |
| commit | cf74402db8af5735815caefe721276c5f9dda7aa (patch) | |
| tree | 02d0a093b75d99d7d2c8a359041648f1167cfc47 /content | |
| parent | 8271001b6f844eee8b8a3fadf0dce9d3f2b4478e (diff) | |
| download | chromium_src-cf74402db8af5735815caefe721276c5f9dda7aa.zip chromium_src-cf74402db8af5735815caefe721276c5f9dda7aa.tar.gz chromium_src-cf74402db8af5735815caefe721276c5f9dda7aa.tar.bz2 | |
Mojo: Add PlatformSupport argument to mojo::embedder::Init().
Also add InitWithSimplePlatformSupport() to test_embedder.h. Use that
for all tests, for now (this won't be right in the long run).
R=darin@chromium.org
Review URL: https://codereview.chromium.org/489593004
Cr-Commit-Position: refs/heads/master@{#290856}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/app/mojo/mojo_init.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/app/mojo/mojo_init.cc b/content/app/mojo/mojo_init.cc index 2873d31..090e69e 100644 --- a/content/app/mojo/mojo_init.cc +++ b/content/app/mojo/mojo_init.cc @@ -4,14 +4,16 @@ #include "content/app/mojo/mojo_init.h" -#include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "mojo/application_manager/application_manager.h" #include "mojo/embedder/embedder.h" +#include "mojo/embedder/simple_platform_support.h" namespace content { void InitializeMojo() { - mojo::embedder::Init(); + mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>( + new mojo::embedder::SimplePlatformSupport())); mojo::ApplicationManager::GetInstance(); } |