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/mus/public/cpp/view.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 std::set<std::string> paths; | 30 std::set<std::string> paths; |
31 paths.insert(kResourceUIPak); | 31 paths.insert(kResourceUIPak); |
32 return paths; | 32 return paths; |
33 } | 33 } |
34 | 34 |
35 } // namespace | 35 } // namespace |
36 | 36 |
37 // TODO(sky): the 1.f should be view->viewport_metrics().device_scale_factor, | 37 // TODO(sky): the 1.f should be view->viewport_metrics().device_scale_factor, |
38 // but that causes clipping problems. No doubt we're not scaling a size | 38 // but that causes clipping problems. No doubt we're not scaling a size |
39 // correctly. | 39 // correctly. |
40 AuraInit::AuraInit(mojo::View* view, mojo::Shell* shell) | 40 AuraInit::AuraInit(mus::View* view, mojo::Shell* shell) |
41 : ui_init_(view->viewport_metrics().size_in_pixels.To<gfx::Size>(), 1.f) { | 41 : ui_init_(view->viewport_metrics().size_in_pixels.To<gfx::Size>(), 1.f) { |
42 aura::Env::CreateInstance(false); | 42 aura::Env::CreateInstance(false); |
43 | 43 |
44 InitializeResources(shell); | 44 InitializeResources(shell); |
45 | 45 |
46 ui::InitializeInputMethodForTesting(); | 46 ui::InitializeInputMethodForTesting(); |
47 } | 47 } |
48 | 48 |
49 AuraInit::~AuraInit() { | 49 AuraInit::~AuraInit() { |
50 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 50 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
(...skipping 28 matching lines...) Expand all Loading... |
79 font_loader_ = skia::AdoptRef(new font_service::FontLoader(shell)); | 79 font_loader_ = skia::AdoptRef(new font_service::FontLoader(shell)); |
80 SkFontConfigInterface::SetGlobal(font_loader_.get()); | 80 SkFontConfigInterface::SetGlobal(font_loader_.get()); |
81 #endif | 81 #endif |
82 | 82 |
83 // There is a bunch of static state in gfx::Font, by running this now, | 83 // There is a bunch of static state in gfx::Font, by running this now, |
84 // before any other apps load, we ensure all the state is set up. | 84 // before any other apps load, we ensure all the state is set up. |
85 gfx::Font(); | 85 gfx::Font(); |
86 } | 86 } |
87 | 87 |
88 } // namespace mandoline | 88 } // namespace mandoline |
OLD | NEW |