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 "ui/views/mus/aura_init.h" | 5 #include "ui/views/mus/aura_init.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
13 #include "components/resource_provider/public/cpp/resource_loader.h" | 13 #include "components/resource_provider/public/cpp/resource_loader.h" |
14 #include "mojo/shell/public/cpp/connector.h" | 14 #include "services/shell/public/cpp/connector.h" |
15 #include "ui/aura/env.h" | 15 #include "ui/aura/env.h" |
16 #include "ui/base/ime/input_method_initializer.h" | 16 #include "ui/base/ime/input_method_initializer.h" |
17 #include "ui/base/resource/resource_bundle.h" | 17 #include "ui/base/resource/resource_bundle.h" |
18 #include "ui/base/ui_base_paths.h" | 18 #include "ui/base/ui_base_paths.h" |
19 #include "ui/views/views_delegate.h" | 19 #include "ui/views/views_delegate.h" |
20 | 20 |
21 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 21 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
22 #include "components/font_service/public/cpp/font_loader.h" | 22 #include "components/font_service/public/cpp/font_loader.h" |
23 #endif | 23 #endif |
24 | 24 |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 font_loader_ = skia::AdoptRef(new font_service::FontLoader(connector)); | 91 font_loader_ = skia::AdoptRef(new font_service::FontLoader(connector)); |
92 SkFontConfigInterface::SetGlobal(font_loader_.get()); | 92 SkFontConfigInterface::SetGlobal(font_loader_.get()); |
93 #endif | 93 #endif |
94 | 94 |
95 // There is a bunch of static state in gfx::Font, by running this now, | 95 // There is a bunch of static state in gfx::Font, by running this now, |
96 // before any other apps load, we ensure all the state is set up. | 96 // before any other apps load, we ensure all the state is set up. |
97 gfx::Font(); | 97 gfx::Font(); |
98 } | 98 } |
99 | 99 |
100 } // namespace views | 100 } // namespace views |
OLD | NEW |