| Index: mandoline/ui/aura/aura_init.cc
|
| diff --git a/mandoline/ui/aura/aura_init.cc b/mandoline/ui/aura/aura_init.cc
|
| index 86c65d7f23deff6aa8d74563943e650ac99c99f2..9873aa0334fb513a24fcedc11af81ddc3243de52 100644
|
| --- a/mandoline/ui/aura/aura_init.cc
|
| +++ b/mandoline/ui/aura/aura_init.cc
|
| @@ -14,10 +14,6 @@
|
| #include "ui/base/ime/input_method_initializer.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/base/ui_base_paths.h"
|
| -
|
| -#if defined(OS_LINUX) && !defined(OS_ANDROID)
|
| -#include "components/font_service/public/cpp/font_loader.h"
|
| -#endif
|
|
|
| namespace mandoline {
|
|
|
| @@ -64,12 +60,6 @@
|
| ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
|
| resource_loader.ReleaseFile(kResourceUIPak),
|
| ui::SCALE_FACTOR_100P);
|
| -
|
| - // Initialize the skia font code to go ask fontconfig underneath.
|
| -#if defined(OS_LINUX) && !defined(OS_ANDROID)
|
| - SkFontConfigInterface::SetGlobal(new font_service::FontLoader(shell));
|
| -#endif
|
| -
|
| // There is a bunch of static state in gfx::Font, by running this now,
|
| // before any other apps load, we ensure all the state is set up.
|
| gfx::Font();
|
|
|