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/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
14 #include "services/catalog/public/cpp/resource_loader.h" | 14 #include "services/catalog/public/cpp/resource_loader.h" |
15 #include "services/catalog/public/interfaces/constants.mojom.h" | 15 #include "services/catalog/public/interfaces/constants.mojom.h" |
16 #include "services/service_manager/public/cpp/connector.h" | 16 #include "services/service_manager/public/cpp/connector.h" |
17 #include "ui/aura/env.h" | 17 #include "ui/aura/env.h" |
18 #include "ui/base/ime/input_method_initializer.h" | 18 #include "ui/base/ime/input_method_initializer.h" |
19 #include "ui/base/material_design/material_design_controller.h" | 19 #include "ui/base/material_design/material_design_controller.h" |
20 #include "ui/base/resource/resource_bundle.h" | 20 #include "ui/base/resource/resource_bundle.h" |
21 #include "ui/base/ui_base_paths.h" | 21 #include "ui/base/ui_base_paths.h" |
22 #include "ui/views/mus/mus_client.h" | 22 #include "ui/views/mus/mus_client.h" |
| 23 #include "ui/views/style/typography_provider.h" |
23 #include "ui/views/views_delegate.h" | 24 #include "ui/views/views_delegate.h" |
24 | 25 |
25 #if defined(OS_LINUX) | 26 #if defined(OS_LINUX) |
26 #include "components/font_service/public/cpp/font_loader.h" | 27 #include "components/font_service/public/cpp/font_loader.h" |
27 #endif | 28 #endif |
28 | 29 |
29 namespace views { | 30 namespace views { |
30 | 31 |
31 namespace { | 32 namespace { |
32 | 33 |
33 class MusViewsDelegate : public ViewsDelegate { | 34 class MusViewsDelegate : public ViewsDelegate { |
34 public: | 35 public: |
35 MusViewsDelegate() {} | 36 MusViewsDelegate() {} |
36 ~MusViewsDelegate() override {} | 37 ~MusViewsDelegate() override {} |
37 | 38 |
38 private: | 39 private: |
39 #if defined(OS_WIN) | 40 #if defined(OS_WIN) |
40 HICON GetSmallWindowIcon() const override { return nullptr; } | 41 HICON GetSmallWindowIcon() const override { return nullptr; } |
41 #endif | 42 #endif |
42 void OnBeforeWidgetInit( | 43 void OnBeforeWidgetInit( |
43 Widget::InitParams* params, | 44 Widget::InitParams* params, |
44 internal::NativeWidgetDelegate* delegate) override {} | 45 internal::NativeWidgetDelegate* delegate) override {} |
45 | 46 |
| 47 const TypographyProvider& GetTypographyProvider() const override { |
| 48 return typography_provider_; |
| 49 } |
| 50 |
| 51 DefaultTypographyProvider typography_provider_; |
| 52 |
46 DISALLOW_COPY_AND_ASSIGN(MusViewsDelegate); | 53 DISALLOW_COPY_AND_ASSIGN(MusViewsDelegate); |
47 }; | 54 }; |
48 | 55 |
49 } // namespace | 56 } // namespace |
50 | 57 |
51 AuraInit::AuraInit(service_manager::Connector* connector, | 58 AuraInit::AuraInit(service_manager::Connector* connector, |
52 const service_manager::Identity& identity, | 59 const service_manager::Identity& identity, |
53 const std::string& resource_file, | 60 const std::string& resource_file, |
54 const std::string& resource_file_200, | 61 const std::string& resource_file_200, |
55 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, | 62 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( | 120 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( |
114 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile); | 121 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile); |
115 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( | 122 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( |
116 std::move(pak_file_2), ui::SCALE_FACTOR_100P); | 123 std::move(pak_file_2), ui::SCALE_FACTOR_100P); |
117 if (!resource_file_200_.empty()) | 124 if (!resource_file_200_.empty()) |
118 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( | 125 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( |
119 loader.TakeFile(resource_file_200_), ui::SCALE_FACTOR_200P); | 126 loader.TakeFile(resource_file_200_), ui::SCALE_FACTOR_200P); |
120 } | 127 } |
121 | 128 |
122 } // namespace views | 129 } // namespace views |
OLD | NEW |