mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14590 from electron/remove-gn-build-define

Browse source 
chore: remove ELECTRON_GN_BUILD define
This commit is contained in:
Jeremy Apthorp 2018-09-12 14:04:33 -07:00 committed by GitHub
commit d78a2a110a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
brightray/BUILD.gn
View file

@ -16,11 +16,6 @@ static_library("brightray") {
include_dirs = [ ".." ] include_dirs = [ ".." ]
defines = [
"DISABLE_NACL=1",
"ELECTRON_GN_BUILD",
]
if (is_linux) { if (is_linux) {
deps += [ "//build/config/linux/gtk" ] deps += [ "//build/config/linux/gtk" ]
} }

29
brightray/common/main_delegate.cc
View file

@ -30,9 +30,6 @@ bool SubprocessNeedsResourceBundle(const std::string& process_type) {
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
// Mac needs them too for scrollbar related images and for sandbox // Mac needs them too for scrollbar related images and for sandbox
// profiles. // profiles.
#if !defined(DISABLE_NACL)
process_type == switches::kNaClLoaderProcess ||
#endif
process_type == switches::kPpapiPluginProcess || process_type == switches::kPpapiPluginProcess ||
process_type == switches::kPpapiBrokerProcess || process_type == switches::kPpapiBrokerProcess ||
process_type == switches::kGpuProcess || process_type == switches::kGpuProcess ||
@ -57,40 +54,20 @@ void LoadResourceBundle(const std::string& locale) {
PathService::Get(base::DIR_MODULE, &pak_dir); PathService::Get(base::DIR_MODULE, &pak_dir);
#endif #endif
#if defined(ELECTRON_GN_BUILD)
ui::ResourceBundle::InitSharedInstanceWithLocale( ui::ResourceBundle::InitSharedInstanceWithLocale(
locale, nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES); locale, nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
bundle.ReloadLocaleResources(locale); bundle.ReloadLocaleResources(locale);
bundle.AddDataPackFromPath(pak_dir.Append(FILE_PATH_LITERAL("resources.pak")), bundle.AddDataPackFromPath(pak_dir.Append(FILE_PATH_LITERAL("resources.pak")),
ui::SCALE_FACTOR_NONE); 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]);
#if defined(ENABLE_PDF_VIEWER) #if defined(ENABLE_PDF_VIEWER)
NOTIMPLEMENTED() << "Hi, whoever's fixing PDF support! Thanks! The pdf viewer "
"resources haven't been ported over to the GN build yet, so you'll "
"probably need to change this bit of code.";
bundle.AddDataPackFromPath( bundle.AddDataPackFromPath(
pak_dir.Append(FILE_PATH_LITERAL("pdf_viewer_resources.pak")), pak_dir.Append(FILE_PATH_LITERAL("pdf_viewer_resources.pak")),
ui::GetSupportedScaleFactors()[0]); ui::GetSupportedScaleFactors()[0]);
#endif // defined(ENABLE_PDF_VIEWER) #endif // defined(ENABLE_PDF_VIEWER)
bundle.AddDataPackFromPath(pak_dir.Append(FILE_PATH_LITERAL(
"blink_image_resources_200_percent.pak")),
ui::SCALE_FACTOR_200P);
bundle.AddDataPackFromPath(
pak_dir.Append(FILE_PATH_LITERAL("content_resources_200_percent.pak")),
ui::SCALE_FACTOR_200P);
bundle.AddDataPackFromPath(
pak_dir.Append(FILE_PATH_LITERAL("ui_resources_200_percent.pak")),
ui::SCALE_FACTOR_200P);
bundle.AddDataPackFromPath(
pak_dir.Append(FILE_PATH_LITERAL("views_resources_200_percent.pak")),
ui::SCALE_FACTOR_200P);
#endif
} }
MainDelegate::MainDelegate() {} MainDelegate::MainDelegate() {}