github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

build: [gn] simplify resource pak build

Browse Source
This commit is contained in:
Jeremy Apthorp
2018-07-17 15:34:19 -07:00
parent ea16445be7
commit 76a62b44dc
4 changed files with 202 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
brightray/common/main_delegate.cc
View File

@@ -48,19 +48,28 @@ void LoadResourceBundle(const std::string& locale) {
if (initialized)
ui::ResourceBundle::CleanupSharedInstance();
ui::ResourceBundle::InitSharedInstanceWithLocale(
locale, nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
bundle.ReloadLocaleResources(locale);
// Load other resource files.
base::FilePath pak_dir;
#if defined(OS_MACOSX)
pak_dir = base::mac::FrameworkBundlePath().Append("Resources");
pak_dir =
base::mac::FrameworkBundlePath().Append(FILE_PATH_LITERAL("Resources"));
#else
PathService::Get(base::DIR_MODULE, &pak_dir);
#endif
#if defined(ELECTRON_GN_BUILD)
ui::ResourceBundle::InitSharedInstanceWithLocale(
locale, nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
bundle.ReloadLocaleResources(locale);
bundle.AddDataPackFromPath(pak_dir.Append(FILE_PATH_LITERAL("resources.pak")),
ui::SCALE_FACTOR_NONE);
#else
ui::ResourceBundle::InitSharedInstanceWithLocale(
locale, nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
bundle.ReloadLocaleResources(locale);
bundle.AddDataPackFromPath(
pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")),
ui::GetSupportedScaleFactors()[0]);
@@ -81,6 +90,7 @@ void LoadResourceBundle(const std::string& locale) {
bundle.AddDataPackFromPath(
pak_dir.Append(FILE_PATH_LITERAL("views_resources_200_percent.pak")),
ui::SCALE_FACTOR_200P);
#endif
}
MainDelegate::MainDelegate() {}