Chromium Code Reviews Chromium Code Reviews
Issue 477923004:
Create native_viewport_service, don't build it into mojo_shell unless Android (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "mojo/aura/aura_init.h" | 5 #include "mojo/aura/aura_init.h" |
| 6 | 6 |
| 7 #include "mojo/aura/context_factory_mojo.h" | 7 #include "mojo/aura/context_factory_mojo.h" |
| 8 #include "mojo/aura/screen_mojo.h" | 8 #include "mojo/aura/screen_mojo.h" |
| 9 #include "ui/aura/env.h" | 9 #include "ui/aura/env.h" |
| 10 | 10 |
| 11 namespace mojo { | 11 namespace mojo { |
| 12 | 12 |
| 13 AuraInit::AuraInit() { | 13 AuraInit::AuraInit() { |
| 14 aura::Env::CreateInstance(true); | 14 aura::Env::CreateInstance(false); |
|
Ben Goodger (Google)
2014/09/02 22:24:16
awesome. what could go wrong??
DaveMoore
2014/09/02 22:39:06
According to sky we shouldn't create a new event s
| |
| 15 | 15 |
| 16 context_factory_.reset(new ContextFactoryMojo); | 16 context_factory_.reset(new ContextFactoryMojo); |
| 17 aura::Env::GetInstance()->set_context_factory(context_factory_.get()); | 17 aura::Env::GetInstance()->set_context_factory(context_factory_.get()); |
| 18 | 18 |
| 19 screen_.reset(ScreenMojo::Create()); | 19 screen_.reset(ScreenMojo::Create()); |
| 20 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get()); | 20 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get()); |
| 21 } | 21 } |
| 22 | 22 |
| 23 AuraInit::~AuraInit() { | 23 AuraInit::~AuraInit() { |
| 24 } | 24 } |
| 25 | 25 |
| 26 } // namespace mojo | 26 } // namespace mojo |
| OLD | NEW |
