mandoline/ui/aura/aura_init.cc - Issue 1344573002: Mandoline: Rename components/view_manager to components/mus

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: mandoline/ui/aura/aura_init.cc

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 5 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 | « mandoline/ui/aura/DEPS ('k') | mandoline/ui/aura/input_method_mandoline.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 "mandoline/ui/aura/aura_init.h"	5 #include "mandoline/ui/aura/aura_init.h"

6	6

7 #include "base/i18n/icu_util.h"	7 #include "base/i18n/icu_util.h"

8 #include "base/lazy_instance.h"	8 #include "base/lazy_instance.h"

9 #include "base/path_service.h"	9 #include "base/path_service.h"

	10 #include "components/mus/public/cpp/view.h"

10 #include "components/resource_provider/public/cpp/resource_loader.h"	11 #include "components/resource_provider/public/cpp/resource_loader.h"

11 #include "components/view_manager/public/cpp/view.h"

12 #include "mojo/converters/geometry/geometry_type_converters.h"	12 #include "mojo/converters/geometry/geometry_type_converters.h"

13 #include "ui/aura/env.h"	13 #include "ui/aura/env.h"

14 #include "ui/base/ime/input_method_initializer.h"	14 #include "ui/base/ime/input_method_initializer.h"

15 #include "ui/base/resource/resource_bundle.h"	15 #include "ui/base/resource/resource_bundle.h"

16 #include "ui/base/ui_base_paths.h"	16 #include "ui/base/ui_base_paths.h"

17	17

18 #if defined(OS_LINUX) && !defined(OS_ANDROID)	18 #if defined(OS_LINUX) && !defined(OS_ANDROID)

19 #include "components/font_service/public/cpp/font_loader.h"	19 #include "components/font_service/public/cpp/font_loader.h"

20 #endif	20 #endif

21	21

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 #if defined(OS_LINUX) && !defined(OS_ANDROID)	69 #if defined(OS_LINUX) && !defined(OS_ANDROID)

70 SkFontConfigInterface::SetGlobal(new font_service::FontLoader(shell));	70 SkFontConfigInterface::SetGlobal(new font_service::FontLoader(shell));

71 #endif	71 #endif

72	72

73 // There is a bunch of static state in gfx::Font, by running this now,	73 // There is a bunch of static state in gfx::Font, by running this now,

74 // before any other apps load, we ensure all the state is set up.	74 // before any other apps load, we ensure all the state is set up.

75 gfx::Font();	75 gfx::Font();

76 }	76 }

77	77

78 } // namespace mandoline	78 } // namespace mandoline

OLD	NEW