| Index: content/app/content_main_runner.cc
|
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
|
| index fe2bb11a3737b311dbb79912b01f6884997ddc01..931e601f5adb62a32a890496d6e56d245e9511bd 100644
|
| --- a/content/app/content_main_runner.cc
|
| +++ b/content/app/content_main_runner.cc
|
| @@ -95,6 +95,10 @@
|
|
|
| #endif // OS_POSIX
|
|
|
| +#if defined(USE_OZONE)
|
| +#include "ui/base/ozone/ozone_platform.h"
|
| +#endif
|
| +
|
| #if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
|
| extern "C" {
|
| int tc_set_new_mode(int mode);
|
| @@ -720,6 +724,10 @@ class ContentMainRunnerImpl : public ContentMainRunner {
|
|
|
| InitializeStatsTable(command_line);
|
|
|
| +#if defined(USE_OZONE)
|
| + ozone_platform_.reset(ui::OzonePlatform::Create());
|
| +#endif
|
| +
|
| if (delegate)
|
| delegate->PreSandboxStartup();
|
|
|
| @@ -831,6 +839,9 @@ class ContentMainRunnerImpl : public ContentMainRunner {
|
| #elif defined(OS_MACOSX)
|
| scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_;
|
| #endif
|
| +#if defined(USE_OZONE)
|
| + scoped_ptr<ui::OzonePlatform> ozone_platform_;
|
| +#endif
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
|
| };
|
|
|