| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 // used to launch the current app). | 98 // used to launch the current app). |
| 99 if (ui::ResourceBundle::HasSharedInstance()) | 99 if (ui::ResourceBundle::HasSharedInstance()) |
| 100 return; | 100 return; |
| 101 | 101 |
| 102 std::set<std::string> resource_paths({resource_file_}); | 102 std::set<std::string> resource_paths({resource_file_}); |
| 103 if (!resource_file_200_.empty()) | 103 if (!resource_file_200_.empty()) |
| 104 resource_paths.insert(resource_file_200_); | 104 resource_paths.insert(resource_file_200_); |
| 105 | 105 |
| 106 catalog::ResourceLoader loader; | 106 catalog::ResourceLoader loader; |
| 107 filesystem::mojom::DirectoryPtr directory; | 107 filesystem::mojom::DirectoryPtr directory; |
| 108 connector->ConnectToInterface(catalog::mojom::kServiceName, &directory); | 108 connector->BindInterface(catalog::mojom::kServiceName, &directory); |
| 109 CHECK(loader.OpenFiles(std::move(directory), resource_paths)); | 109 CHECK(loader.OpenFiles(std::move(directory), resource_paths)); |
| 110 ui::RegisterPathProvider(); | 110 ui::RegisterPathProvider(); |
| 111 base::File pak_file = loader.TakeFile(resource_file_); | 111 base::File pak_file = loader.TakeFile(resource_file_); |
| 112 base::File pak_file_2 = pak_file.Duplicate(); | 112 base::File pak_file_2 = pak_file.Duplicate(); |
| 113 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( | 113 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( |
| 114 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile); | 114 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile); |
| 115 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( | 115 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( |
| 116 std::move(pak_file_2), ui::SCALE_FACTOR_100P); | 116 std::move(pak_file_2), ui::SCALE_FACTOR_100P); |
| 117 if (!resource_file_200_.empty()) | 117 if (!resource_file_200_.empty()) |
| 118 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( | 118 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( |
| 119 loader.TakeFile(resource_file_200_), ui::SCALE_FACTOR_200P); | 119 loader.TakeFile(resource_file_200_), ui::SCALE_FACTOR_200P); |
| 120 } | 120 } |
| 121 | 121 |
| 122 } // namespace views | 122 } // namespace views |
| OLD | NEW |