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" |
(...skipping 27 matching lines...) Expand all Loading... |
38 #endif | 38 #endif |
39 void OnBeforeWidgetInit( | 39 void OnBeforeWidgetInit( |
40 Widget::InitParams* params, | 40 Widget::InitParams* params, |
41 internal::NativeWidgetDelegate* delegate) override {} | 41 internal::NativeWidgetDelegate* delegate) override {} |
42 | 42 |
43 DISALLOW_COPY_AND_ASSIGN(MusViewsDelegate); | 43 DISALLOW_COPY_AND_ASSIGN(MusViewsDelegate); |
44 }; | 44 }; |
45 | 45 |
46 } // namespace | 46 } // namespace |
47 | 47 |
48 AuraInit::AuraInit(shell::Connector* connector, | 48 AuraInit::AuraInit(service_manager::Connector* connector, |
49 const std::string& resource_file, | 49 const std::string& resource_file, |
50 const std::string& resource_file_200) | 50 const std::string& resource_file_200) |
51 : resource_file_(resource_file), | 51 : resource_file_(resource_file), |
52 resource_file_200_(resource_file_200), | 52 resource_file_200_(resource_file_200), |
53 env_(aura::Env::CreateInstance()), | 53 env_(aura::Env::CreateInstance()), |
54 views_delegate_(new MusViewsDelegate) { | 54 views_delegate_(new MusViewsDelegate) { |
55 ui::MaterialDesignController::Initialize(); | 55 ui::MaterialDesignController::Initialize(); |
56 InitializeResources(connector); | 56 InitializeResources(connector); |
57 | 57 |
58 // Initialize the skia font code to go ask fontconfig underneath. | 58 // Initialize the skia font code to go ask fontconfig underneath. |
(...skipping 14 matching lines...) Expand all Loading... |
73 if (font_loader_.get()) { | 73 if (font_loader_.get()) { |
74 SkFontConfigInterface::SetGlobal(nullptr); | 74 SkFontConfigInterface::SetGlobal(nullptr); |
75 // FontLoader is ref counted. We need to explicitly shutdown the background | 75 // FontLoader is ref counted. We need to explicitly shutdown the background |
76 // thread, otherwise the background thread may be shutdown after the app is | 76 // thread, otherwise the background thread may be shutdown after the app is |
77 // torn down, when we're in a bad state. | 77 // torn down, when we're in a bad state. |
78 font_loader_->Shutdown(); | 78 font_loader_->Shutdown(); |
79 } | 79 } |
80 #endif | 80 #endif |
81 } | 81 } |
82 | 82 |
83 void AuraInit::InitializeResources(shell::Connector* connector) { | 83 void AuraInit::InitializeResources(service_manager::Connector* connector) { |
84 // Resources may have already been initialized (e.g. when 'chrome --mash' is | 84 // Resources may have already been initialized (e.g. when 'chrome --mash' is |
85 // used to launch the current app). | 85 // used to launch the current app). |
86 if (ui::ResourceBundle::HasSharedInstance()) | 86 if (ui::ResourceBundle::HasSharedInstance()) |
87 return; | 87 return; |
88 | 88 |
89 std::set<std::string> resource_paths({resource_file_}); | 89 std::set<std::string> resource_paths({resource_file_}); |
90 if (!resource_file_200_.empty()) | 90 if (!resource_file_200_.empty()) |
91 resource_paths.insert(resource_file_200_); | 91 resource_paths.insert(resource_file_200_); |
92 | 92 |
93 catalog::ResourceLoader loader; | 93 catalog::ResourceLoader loader; |
94 filesystem::mojom::DirectoryPtr directory; | 94 filesystem::mojom::DirectoryPtr directory; |
95 connector->ConnectToInterface("service:catalog", &directory); | 95 connector->ConnectToInterface("service:catalog", &directory); |
96 CHECK(loader.OpenFiles(std::move(directory), resource_paths)); | 96 CHECK(loader.OpenFiles(std::move(directory), resource_paths)); |
97 ui::RegisterPathProvider(); | 97 ui::RegisterPathProvider(); |
98 base::File pak_file = loader.TakeFile(resource_file_); | 98 base::File pak_file = loader.TakeFile(resource_file_); |
99 base::File pak_file_2 = pak_file.Duplicate(); | 99 base::File pak_file_2 = pak_file.Duplicate(); |
100 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( | 100 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( |
101 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile); | 101 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile); |
102 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( | 102 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( |
103 std::move(pak_file_2), ui::SCALE_FACTOR_100P); | 103 std::move(pak_file_2), ui::SCALE_FACTOR_100P); |
104 if (!resource_file_200_.empty()) | 104 if (!resource_file_200_.empty()) |
105 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( | 105 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( |
106 loader.TakeFile(resource_file_200_), ui::SCALE_FACTOR_200P); | 106 loader.TakeFile(resource_file_200_), ui::SCALE_FACTOR_200P); |
107 } | 107 } |
108 | 108 |
109 } // namespace views | 109 } // namespace views |
OLD | NEW |