mojo/aura/aura_init.cc - Issue 554163003: Revert of Create native_viewport_service, don't build it into mojo_shell unless Android

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: mojo/aura/aura_init.cc

Issue 554163003: Revert of Create native_viewport_service, don't build it into mojo_shell unless Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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 | Annotate | Revision Log

« no previous file with comments | « no previous file | mojo/mojo.gyp » ('j') | no next file with comments »

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(false);	14 aura::Env::CreateInstance(true);

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